1. 14 Apr, 2015 4 commits
    • Andy Wilkinson's avatar
      Update MetricFilter to treat an unsuccessful call to doFilter as a 500 · 0c7708bf
      Andy Wilkinson authored
      Previously, if a call to doFilter in MetricFilter failed (i.e. it threw
      an exception), it would be handled as if it had a response status of
      200. This is because the servlet container was yet to handle the
      exception and set the response status to 500.
      
      This commit updates MetricFilter to assume that an exception thrown from
      doFilter will result in a response with a status of 500. Strictly
      speaking, even though the filter has highest precedence and will
      therefore run last on the way back out, this may not always be the case.
      For example, a custom Tomcat Valve could handle the exception and result
      in a 200 response but that’s an edge case that’s into shooting yourself
      in the foot territory.
      
      Closes gh-2818
      0c7708bf
    • Andy Wilkinson's avatar
    • Andy Wilkinson's avatar
      Provide dependency management for Antlr 2 · 2d7c0c2f
      Andy Wilkinson authored
      Hibernate depends on antlr:antlr:2.7.7 (the latest version on Antlr 2)
      and fails with earlier 2.7.x versions due to a missing method. This
      can cause problems for Maven users if they also depend on something that
      pulls in an earlier version of Antlr, such as
      spring-boot-starter-velocity. Gradle users are unaffected as, when
      multiple versions of a dependency are found in the graph, Gradle will
      choose the latest version.
      
      This commit adds dependency management for antlr:antlr:2.7.7 to ensure
      that the latest, and Hibernate compatible, version of Antlr 2 is used.
      
      Closes gh-2814
      2d7c0c2f
    • Stephane Nicoll's avatar
      Polish documentation · 0f142109
      Stephane Nicoll authored
      0f142109
  2. 13 Apr, 2015 2 commits
  3. 09 Apr, 2015 3 commits
  4. 08 Apr, 2015 4 commits
  5. 07 Apr, 2015 8 commits
  6. 03 Apr, 2015 1 commit
    • Stephane Nicoll's avatar
      Clarified the naming scheme for starters · adaf1752
      Stephane Nicoll authored
      Initial update to the documentation to mention how a 3rd party starter
      should be named. The current doc sends a completely inconsistent message
      to what we actually intend.
      
      See gh-2537
      adaf1752
  7. 31 Mar, 2015 6 commits
    • Phillip Webb's avatar
      Merge branch '1.1.x' into 1.2.x · fa0a2f39
      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-integration-tests/spring-boot-gradle-tests/pom.xml
      	spring-boot-integration-tests/spring-boot-security-tests/pom.xml
      	spring-boot-integration-tests/spring-boot-security-tests/spring-boot-security-tests-web-helloworld/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-hateoas/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-tomcat/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
      fa0a2f39
    • Phillip Webb's avatar
      Fixup version numbers following release · 42e69359
      Phillip Webb authored
      42e69359
    • Phillip Webb's avatar
      Fixup version numbers following release · 4b7c6200
      Phillip Webb authored
      4b7c6200
    • Spring Buildmaster's avatar
      Next development version · e03c11dd
      Spring Buildmaster authored
      e03c11dd
    • Phillip Webb's avatar
      Revert "Upgrade to H2 1.4.186" · cddf54e5
      Phillip Webb authored
      This reverts commit 3a22443f.
      cddf54e5
    • Spring Buildmaster's avatar
      Next development version · b8d2a55b
      Spring Buildmaster authored
      b8d2a55b
  8. 30 Mar, 2015 9 commits
  9. 26 Mar, 2015 3 commits