1. 18 Nov, 2014 6 commits
    • Andy Wilkinson's avatar
      Merge branch '1.1.x' · 86357245
      Andy Wilkinson authored
      86357245
    • Andy Wilkinson's avatar
      Don't flush in ErrorPageFilter for < 400 response that's committed · 41cb5678
      Andy Wilkinson authored
      Previously, for a non-async response with a successful status (< 400),
      ErrorPageFilter would always call flushBuffer. This triggers an
      exception in Tomcat if the client has closed the connection before the
      response has been fully sent. In this case, Tomcat treats the response
      as successful and commits it before control returns to the filter.
      
      This commit updates ErrorPageFilter to only perform the flush if the
      response has not already been committed, leaving any further flushing
      that may be necessary to be handled by the servlet container.
      
      Fixes gh-1938
      41cb5678
    • Phillip Webb's avatar
      Merge branch '1.1.x' · 6cdd27a3
      Phillip Webb authored
      6cdd27a3
    • Phillip Webb's avatar
      Find @ConfigurationProperties annotation on proxy · f224c7ac
      Phillip Webb authored
      Update ConfigurationPropertiesReportEndpoint to find
      @ConfigurationProperties using `context.findAnnotationOnBean` rather
      than `AnnotationUtils.findAnnotation`. This will correctly find the
      annotation even if the bean is an interface based proxy.
      
      Fixes gh-1927
      f224c7ac
    • Phillip Webb's avatar
      Merge branch '1.1.x' · ba2446a3
      Phillip Webb authored
      ba2446a3
    • Phillip Webb's avatar
      Use embedded docbook XSLT files · 285563a5
      Phillip Webb authored
      Switch from external docbook XSLT to those shipped as part of the
      Maven plugin.
      
      Fixes gh-1942
      285563a5
  2. 17 Nov, 2014 10 commits
  3. 14 Nov, 2014 4 commits
    • Phillip Webb's avatar
      Merge branch '1.1.x' · f6074ff2
      Phillip Webb authored
      f6074ff2
    • Phillip Webb's avatar
      Relax servlet check · 608b1e65
      Phillip Webb authored
      Relax the servlet version check in Maven integration tests.
      
      See gh-1797
      608b1e65
    • Phillip Webb's avatar
      Merge branch '1.1.x' · 3030ad42
      Phillip Webb authored
      Conflicts:
      	pom.xml
      	spring-boot-actuator/pom.xml
      	spring-boot-autoconfigure/pom.xml
      	spring-boot-cli/pom.xml
      	spring-boot-dependencies/pom.xml
      	spring-boot-docs/pom.xml
      	spring-boot-full-build/pom.xml
      	spring-boot-integration-tests/pom.xml
      	spring-boot-parent/pom.xml
      	spring-boot-samples/pom.xml
      	spring-boot-samples/spring-boot-sample-actuator-log4j/pom.xml
      	spring-boot-samples/spring-boot-sample-actuator-noweb/pom.xml
      	spring-boot-samples/spring-boot-sample-actuator-ui/pom.xml
      	spring-boot-samples/spring-boot-sample-actuator/build.gradle
      	spring-boot-samples/spring-boot-sample-actuator/build.xml
      	spring-boot-samples/spring-boot-sample-actuator/pom.xml
      	spring-boot-samples/spring-boot-sample-amqp/pom.xml
      	spring-boot-samples/spring-boot-sample-aop/pom.xml
      	spring-boot-samples/spring-boot-sample-batch/pom.xml
      	spring-boot-samples/spring-boot-sample-data-elasticsearch/pom.xml
      	spring-boot-samples/spring-boot-sample-data-gemfire/pom.xml
      	spring-boot-samples/spring-boot-sample-data-jpa/pom.xml
      	spring-boot-samples/spring-boot-sample-data-mongodb/pom.xml
      	spring-boot-samples/spring-boot-sample-data-redis/pom.xml
      	spring-boot-samples/spring-boot-sample-data-rest/pom.xml
      	spring-boot-samples/spring-boot-sample-data-solr/pom.xml
      	spring-boot-samples/spring-boot-sample-flyway/pom.xml
      	spring-boot-samples/spring-boot-sample-hornetq/pom.xml
      	spring-boot-samples/spring-boot-sample-integration/pom.xml
      	spring-boot-samples/spring-boot-sample-jetty/pom.xml
      	spring-boot-samples/spring-boot-sample-liquibase/pom.xml
      	spring-boot-samples/spring-boot-sample-parent-context/pom.xml
      	spring-boot-samples/spring-boot-sample-profile/build.gradle
      	spring-boot-samples/spring-boot-sample-profile/pom.xml
      	spring-boot-samples/spring-boot-sample-secure/pom.xml
      	spring-boot-samples/spring-boot-sample-servlet/pom.xml
      	spring-boot-samples/spring-boot-sample-simple/build.gradle
      	spring-boot-samples/spring-boot-sample-simple/pom.xml
      	spring-boot-samples/spring-boot-sample-tomcat-jsp/pom.xml
      	spring-boot-samples/spring-boot-sample-tomcat-multi-connectors/pom.xml
      	spring-boot-samples/spring-boot-sample-tomcat-ssl/pom.xml
      	spring-boot-samples/spring-boot-sample-tomcat/pom.xml
      	spring-boot-samples/spring-boot-sample-traditional/pom.xml
      	spring-boot-samples/spring-boot-sample-velocity/pom.xml
      	spring-boot-samples/spring-boot-sample-web-freemarker/pom.xml
      	spring-boot-samples/spring-boot-sample-web-groovy-templates/pom.xml
      	spring-boot-samples/spring-boot-sample-web-jsp/pom.xml
      	spring-boot-samples/spring-boot-sample-web-method-security/pom.xml
      	spring-boot-samples/spring-boot-sample-web-secure-custom/pom.xml
      	spring-boot-samples/spring-boot-sample-web-secure-jdbc/pom.xml
      	spring-boot-samples/spring-boot-sample-web-secure/pom.xml
      	spring-boot-samples/spring-boot-sample-web-static/build.gradle
      	spring-boot-samples/spring-boot-sample-web-static/pom.xml
      	spring-boot-samples/spring-boot-sample-web-ui/build.gradle
      	spring-boot-samples/spring-boot-sample-web-ui/pom.xml
      	spring-boot-samples/spring-boot-sample-web-velocity/pom.xml
      	spring-boot-samples/spring-boot-sample-websocket/pom.xml
      	spring-boot-samples/spring-boot-sample-ws/pom.xml
      	spring-boot-samples/spring-boot-sample-xml/pom.xml
      	spring-boot-starters/pom.xml
      	spring-boot-starters/spring-boot-starter-actuator/pom.xml
      	spring-boot-starters/spring-boot-starter-amqp/pom.xml
      	spring-boot-starters/spring-boot-starter-aop/pom.xml
      	spring-boot-starters/spring-boot-starter-batch/pom.xml
      	spring-boot-starters/spring-boot-starter-data-elasticsearch/pom.xml
      	spring-boot-starters/spring-boot-starter-data-gemfire/pom.xml
      	spring-boot-starters/spring-boot-starter-data-jpa/pom.xml
      	spring-boot-starters/spring-boot-starter-data-mongodb/pom.xml
      	spring-boot-starters/spring-boot-starter-data-rest/pom.xml
      	spring-boot-starters/spring-boot-starter-data-solr/pom.xml
      	spring-boot-starters/spring-boot-starter-freemarker/pom.xml
      	spring-boot-starters/spring-boot-starter-groovy-templates/pom.xml
      	spring-boot-starters/spring-boot-starter-hornetq/pom.xml
      	spring-boot-starters/spring-boot-starter-integration/pom.xml
      	spring-boot-starters/spring-boot-starter-jdbc/pom.xml
      	spring-boot-starters/spring-boot-starter-jetty/pom.xml
      	spring-boot-starters/spring-boot-starter-log4j/pom.xml
      	spring-boot-starters/spring-boot-starter-logging/pom.xml
      	spring-boot-starters/spring-boot-starter-mobile/pom.xml
      	spring-boot-starters/spring-boot-starter-parent/pom.xml
      	spring-boot-starters/spring-boot-starter-redis/pom.xml
      	spring-boot-starters/spring-boot-starter-remote-shell/pom.xml
      	spring-boot-starters/spring-boot-starter-security/pom.xml
      	spring-boot-starters/spring-boot-starter-social-facebook/pom.xml
      	spring-boot-starters/spring-boot-starter-social-linkedin/pom.xml
      	spring-boot-starters/spring-boot-starter-social-twitter/pom.xml
      	spring-boot-starters/spring-boot-starter-test/pom.xml
      	spring-boot-starters/spring-boot-starter-thymeleaf/pom.xml
      	spring-boot-starters/spring-boot-starter-tomcat/pom.xml
      	spring-boot-starters/spring-boot-starter-velocity/pom.xml
      	spring-boot-starters/spring-boot-starter-web/pom.xml
      	spring-boot-starters/spring-boot-starter-websocket/pom.xml
      	spring-boot-starters/spring-boot-starter-ws/pom.xml
      	spring-boot-starters/spring-boot-starter/pom.xml
      	spring-boot-tools/pom.xml
      	spring-boot-tools/spring-boot-dependency-tools/pom.xml
      	spring-boot-tools/spring-boot-gradle-plugin/pom.xml
      	spring-boot-tools/spring-boot-loader-tools/pom.xml
      	spring-boot-tools/spring-boot-loader/pom.xml
      	spring-boot-tools/spring-boot-maven-plugin/pom.xml
      	spring-boot-versions/pom.xml
      	spring-boot/pom.xml
      3030ad42
    • Phillip Webb's avatar
      Sync up versions used in Maven integration tests · 3a9d6242
      Phillip Webb authored
      Fixes gh-1797
      3a9d6242
  4. 13 Nov, 2014 3 commits
  5. 12 Nov, 2014 4 commits
  6. 11 Nov, 2014 13 commits