1. 09 Oct, 2014 6 commits
  2. 08 Oct, 2014 15 commits
  3. 07 Oct, 2014 3 commits
  4. 06 Oct, 2014 10 commits
    • Phillip Webb's avatar
      Polish · 62eb01f0
      Phillip Webb authored
      62eb01f0
    • Phillip Webb's avatar
      Merge branch '1.1.x' · 09d5812c
      Phillip Webb authored
      09d5812c
    • Phillip Webb's avatar
      Rename SampleIntegrationApplicationTests · b616e9fd
      Phillip Webb authored
      b616e9fd
    • Phillip Webb's avatar
      Merge branch '1.1.x' · 872f30e5
      Phillip Webb authored
      Conflicts:
      	spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/repository/redis/RedisMetricRepository.java
      872f30e5
    • Phillip Webb's avatar
      Polish · 9dfbc25e
      Phillip Webb authored
      9dfbc25e
    • Andy Wilkinson's avatar
      Merge branch '1.1.x' · 73b80dbe
      Andy Wilkinson authored
      Conflicts:
      	spring-boot-dependencies/pom.xml
      73b80dbe
    • Andy Wilkinson's avatar
      Upgrade to Spring Loaded 1.2.1.RELEASE · e130c00e
      Andy Wilkinson authored
      Closes gh-1474
      e130c00e
    • Andy Wilkinson's avatar
      Merge branch 'gh-1664' · 06e18c6a
      Andy Wilkinson authored
      06e18c6a
    • Andy Wilkinson's avatar
      Make MetricFilter auto-configuration conditional on OncePerRequestFilter · e90c8548
      Andy Wilkinson authored
      In addition to requiring the Servlet API to be on the classpath,
      MetricFilter requires spring-web to also be on the classpath as it
      extends OncePerRequestFilter. This commit updates the auto-configuration
      for MetricFilter so that it will be disabled in the absence of a 
      dependency on spring-web.
      
      Fixes gh-1664
      e90c8548
    • Sebastien Deleuze's avatar
      Support Jackson based XML serialization and Jackson2ObjectMapperBuilder · 315213ea
      Sebastien Deleuze authored
      This commit introduces support for Jackson based XML serialization, using the
      new MappingJackson2XmlHttpMessageConverter provided by Spring Framework
      4.1. It is automatically activated when Jackson XML extension is detected on the
      classpath.
      
      Jackson2ObjectMapperBuilder is now used to create ObjectMapper and XmlMapper
      instances with the following customized properties:
       - MapperFeature.DEFAULT_VIEW_INCLUSION is disabled
       - DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES is disabled
      
      JodaModuleAutoConfiguration and Jsr310ModuleAutoConfiguration have been removed
      since their behaviors are now handled directly by the ObjectMapper builder.
      
      In addition to the existing @Bean of type ObjectMapper support, it is now
      possible to customize Jackson based serialization properties by declaring
      a @Bean of type Jackson2ObjectMapperBuilder.
      
      Fixes gh-1237
      Fixes gh-1580
      Fixes gh-1644
      315213ea
  5. 03 Oct, 2014 2 commits
  6. 02 Oct, 2014 4 commits