1. 07 Apr, 2015 5 commits
  2. 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
  3. 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
  4. 30 Mar, 2015 9 commits
  5. 26 Mar, 2015 19 commits