From 68e5a7e8874178ae0aabc1cd578c51a6a4668721 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Fri, 2 Aug 2013 09:27:02 +0100 Subject: [PATCH] Bump version to 0.5.0.M1 --- pom.xml | 4 ++-- spring-boot-actuator/pom.xml | 2 +- spring-boot-autoconfigure/pom.xml | 2 +- spring-boot-cli/pom.xml | 2 +- spring-boot-gradle-plugin/pom.xml | 2 +- spring-boot-integration-tests/pom.xml | 2 +- spring-boot-loader-tools/pom.xml | 2 +- .../spring-boot-sample-tomcat/pom.xml | 2 +- spring-boot-loader/pom.xml | 2 +- spring-boot-maven-plugin/pom.xml | 2 +- spring-boot-samples/pom.xml | 2 +- .../spring-boot-sample-actuator-ui/pom.xml | 2 +- .../spring-boot-sample-actuator/pom.xml | 2 +- .../spring-boot-sample-batch/pom.xml | 2 +- .../spring-boot-sample-data-jpa/pom.xml | 2 +- .../data/jpa/SampleDataJpaApplicationTests.java | 3 +-- .../spring-boot-sample-integration/pom.xml | 2 +- .../spring-boot-sample-jetty/pom.xml | 2 +- .../spring-boot-sample-profile/pom.xml | 2 +- .../spring-boot-sample-simple/pom.xml | 2 +- .../spring-boot-sample-tomcat/pom.xml | 2 +- .../spring-boot-sample-traditional/pom.xml | 2 +- .../spring-boot-sample-web-static/pom.xml | 2 +- .../spring-boot-sample-web-ui/pom.xml | 2 +- .../spring-boot-sample-xml/pom.xml | 2 +- spring-boot-starters/pom.xml | 2 +- .../spring-boot-starter-actuator/pom.xml | 2 +- .../spring-boot-starter-batch/pom.xml | 2 +- .../spring-boot-starter-data-jpa/pom.xml | 2 +- .../spring-boot-starter-integration/pom.xml | 2 +- .../spring-boot-starter-jetty/pom.xml | 2 +- .../spring-boot-starter-logging/pom.xml | 2 +- .../spring-boot-starter-parent/pom.xml | 15 ++++++++++++--- .../spring-boot-starter-security/pom.xml | 2 +- .../spring-boot-starter-tomcat/pom.xml | 2 +- .../spring-boot-starter-web/pom.xml | 2 +- spring-boot-starters/spring-boot-starter/pom.xml | 2 +- spring-boot-starters/src/main/parent/pom.xml | 13 +++++++++++-- spring-boot/pom.xml | 2 +- 39 files changed, 61 insertions(+), 44 deletions(-) diff --git a/pom.xml b/pom.xml index 083a808f922..48de4dbd9cf 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.boot spring-boot-parent - 0.5.0.BUILD-SNAPSHOT + 0.5.0.M1 pom 3.0.0 @@ -14,7 +14,7 @@ 1.6 UTF-8 3.0.5 - 4.0.0.BUILD-SNAPSHOT + 4.0.0.M2 3.2.0.M2 2.2.4.RELEASE 2.2.0.RELEASE diff --git a/spring-boot-actuator/pom.xml b/spring-boot-actuator/pom.xml index 7c983e8d623..0bc078b8321 100644 --- a/spring-boot-actuator/pom.xml +++ b/spring-boot-actuator/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-parent - 0.5.0.BUILD-SNAPSHOT + 0.5.0.M1 spring-boot-actuator jar diff --git a/spring-boot-autoconfigure/pom.xml b/spring-boot-autoconfigure/pom.xml index 679e9b4b2f5..ffcd651360a 100644 --- a/spring-boot-autoconfigure/pom.xml +++ b/spring-boot-autoconfigure/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-parent - 0.5.0.BUILD-SNAPSHOT + 0.5.0.M1 spring-boot-autoconfigure jar diff --git a/spring-boot-cli/pom.xml b/spring-boot-cli/pom.xml index 5df942c36a9..7639fb67e1e 100644 --- a/spring-boot-cli/pom.xml +++ b/spring-boot-cli/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-parent - 0.5.0.BUILD-SNAPSHOT + 0.5.0.M1 spring-boot-cli jar diff --git a/spring-boot-gradle-plugin/pom.xml b/spring-boot-gradle-plugin/pom.xml index 125e6d2ba15..86940bb05f7 100644 --- a/spring-boot-gradle-plugin/pom.xml +++ b/spring-boot-gradle-plugin/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-parent - 0.5.0.BUILD-SNAPSHOT + 0.5.0.M1 spring-boot-gradle-plugin diff --git a/spring-boot-integration-tests/pom.xml b/spring-boot-integration-tests/pom.xml index fd1377658e9..52ed830dd81 100644 --- a/spring-boot-integration-tests/pom.xml +++ b/spring-boot-integration-tests/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-parent - 0.5.0.BUILD-SNAPSHOT + 0.5.0.M1 spring-boot-integration-tests pom diff --git a/spring-boot-loader-tools/pom.xml b/spring-boot-loader-tools/pom.xml index 993633ee1b7..3cf967d85be 100644 --- a/spring-boot-loader-tools/pom.xml +++ b/spring-boot-loader-tools/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-parent - 0.5.0.BUILD-SNAPSHOT + 0.5.0.M1 spring-boot-loader-tools jar diff --git a/spring-boot-loader-tools/src/test/resources/META-INF/maven/org.springframework.boot/spring-boot-sample-tomcat/pom.xml b/spring-boot-loader-tools/src/test/resources/META-INF/maven/org.springframework.boot/spring-boot-sample-tomcat/pom.xml index b3cb2d180d8..48eafd02919 100644 --- a/spring-boot-loader-tools/src/test/resources/META-INF/maven/org.springframework.boot/spring-boot-sample-tomcat/pom.xml +++ b/spring-boot-loader-tools/src/test/resources/META-INF/maven/org.springframework.boot/spring-boot-sample-tomcat/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 0.5.0.BUILD-SNAPSHOT + 0.5.0.M1 spring-boot-sample-tomcat jar diff --git a/spring-boot-loader/pom.xml b/spring-boot-loader/pom.xml index 2bc6203469d..9f67b2ebf72 100644 --- a/spring-boot-loader/pom.xml +++ b/spring-boot-loader/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-parent - 0.5.0.BUILD-SNAPSHOT + 0.5.0.M1 spring-boot-loader jar diff --git a/spring-boot-maven-plugin/pom.xml b/spring-boot-maven-plugin/pom.xml index 57ecb5beec8..ee4af432506 100644 --- a/spring-boot-maven-plugin/pom.xml +++ b/spring-boot-maven-plugin/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-parent - 0.5.0.BUILD-SNAPSHOT + 0.5.0.M1 spring-boot-maven-plugin maven-plugin diff --git a/spring-boot-samples/pom.xml b/spring-boot-samples/pom.xml index 57f4bb9a6c7..066d2325a90 100644 --- a/spring-boot-samples/pom.xml +++ b/spring-boot-samples/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-parent - 0.5.0.BUILD-SNAPSHOT + 0.5.0.M1 spring-boot-samples pom diff --git a/spring-boot-samples/spring-boot-sample-actuator-ui/pom.xml b/spring-boot-samples/spring-boot-sample-actuator-ui/pom.xml index 1c07bc7eedf..08c1b2c93e0 100644 --- a/spring-boot-samples/spring-boot-sample-actuator-ui/pom.xml +++ b/spring-boot-samples/spring-boot-sample-actuator-ui/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 0.5.0.BUILD-SNAPSHOT + 0.5.0.M1 spring-boot-sample-actuator-ui jar diff --git a/spring-boot-samples/spring-boot-sample-actuator/pom.xml b/spring-boot-samples/spring-boot-sample-actuator/pom.xml index 27d22f94999..8c4c554d9b5 100644 --- a/spring-boot-samples/spring-boot-sample-actuator/pom.xml +++ b/spring-boot-samples/spring-boot-sample-actuator/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 0.5.0.BUILD-SNAPSHOT + 0.5.0.M1 spring-boot-sample-actuator jar diff --git a/spring-boot-samples/spring-boot-sample-batch/pom.xml b/spring-boot-samples/spring-boot-sample-batch/pom.xml index c5db2cfd9aa..c54506d9007 100644 --- a/spring-boot-samples/spring-boot-sample-batch/pom.xml +++ b/spring-boot-samples/spring-boot-sample-batch/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 0.5.0.BUILD-SNAPSHOT + 0.5.0.M1 spring-boot-sample-batch jar diff --git a/spring-boot-samples/spring-boot-sample-data-jpa/pom.xml b/spring-boot-samples/spring-boot-sample-data-jpa/pom.xml index 43c19d1f012..00d91a4471f 100644 --- a/spring-boot-samples/spring-boot-sample-data-jpa/pom.xml +++ b/spring-boot-samples/spring-boot-sample-data-jpa/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 0.5.0.BUILD-SNAPSHOT + 0.5.0.M1 spring-boot-sample-data-jpa jar diff --git a/spring-boot-samples/spring-boot-sample-data-jpa/src/test/java/org/springframework/boot/sample/data/jpa/SampleDataJpaApplicationTests.java b/spring-boot-samples/spring-boot-sample-data-jpa/src/test/java/org/springframework/boot/sample/data/jpa/SampleDataJpaApplicationTests.java index 0b1caa15da2..d5cc937ab26 100644 --- a/spring-boot-samples/spring-boot-sample-data-jpa/src/test/java/org/springframework/boot/sample/data/jpa/SampleDataJpaApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-data-jpa/src/test/java/org/springframework/boot/sample/data/jpa/SampleDataJpaApplicationTests.java @@ -26,7 +26,6 @@ import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.springframework.boot.SpringApplication; -import org.springframework.boot.sample.data.jpa.SampleDataJpaApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -56,7 +55,7 @@ public class SampleDataJpaApplicationTests { .run(SampleDataJpaApplication.class); } }); - context = future.get(10, TimeUnit.SECONDS); + context = future.get(30, TimeUnit.SECONDS); } @AfterClass diff --git a/spring-boot-samples/spring-boot-sample-integration/pom.xml b/spring-boot-samples/spring-boot-sample-integration/pom.xml index c10e50f5275..3ae337f2045 100644 --- a/spring-boot-samples/spring-boot-sample-integration/pom.xml +++ b/spring-boot-samples/spring-boot-sample-integration/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 0.5.0.BUILD-SNAPSHOT + 0.5.0.M1 spring-boot-sample-integration jar diff --git a/spring-boot-samples/spring-boot-sample-jetty/pom.xml b/spring-boot-samples/spring-boot-sample-jetty/pom.xml index 22a74ceb282..66ed8d93214 100644 --- a/spring-boot-samples/spring-boot-sample-jetty/pom.xml +++ b/spring-boot-samples/spring-boot-sample-jetty/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 0.5.0.BUILD-SNAPSHOT + 0.5.0.M1 spring-boot-sample-jetty jar diff --git a/spring-boot-samples/spring-boot-sample-profile/pom.xml b/spring-boot-samples/spring-boot-sample-profile/pom.xml index e1cf213435e..64348db51aa 100644 --- a/spring-boot-samples/spring-boot-sample-profile/pom.xml +++ b/spring-boot-samples/spring-boot-sample-profile/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 0.5.0.BUILD-SNAPSHOT + 0.5.0.M1 spring-boot-sample-profile jar diff --git a/spring-boot-samples/spring-boot-sample-simple/pom.xml b/spring-boot-samples/spring-boot-sample-simple/pom.xml index 65179e1c6dd..d6516ca2f3b 100644 --- a/spring-boot-samples/spring-boot-sample-simple/pom.xml +++ b/spring-boot-samples/spring-boot-sample-simple/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 0.5.0.BUILD-SNAPSHOT + 0.5.0.M1 spring-boot-sample-simple jar diff --git a/spring-boot-samples/spring-boot-sample-tomcat/pom.xml b/spring-boot-samples/spring-boot-sample-tomcat/pom.xml index b3cb2d180d8..48eafd02919 100644 --- a/spring-boot-samples/spring-boot-sample-tomcat/pom.xml +++ b/spring-boot-samples/spring-boot-sample-tomcat/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 0.5.0.BUILD-SNAPSHOT + 0.5.0.M1 spring-boot-sample-tomcat jar diff --git a/spring-boot-samples/spring-boot-sample-traditional/pom.xml b/spring-boot-samples/spring-boot-sample-traditional/pom.xml index 7916f24370e..0abd8223cef 100644 --- a/spring-boot-samples/spring-boot-sample-traditional/pom.xml +++ b/spring-boot-samples/spring-boot-sample-traditional/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-samples - 0.5.0.BUILD-SNAPSHOT + 0.5.0.M1 spring-boot-sample-traditional war diff --git a/spring-boot-samples/spring-boot-sample-web-static/pom.xml b/spring-boot-samples/spring-boot-sample-web-static/pom.xml index 5402a3eb8cb..cd9946d934c 100644 --- a/spring-boot-samples/spring-boot-sample-web-static/pom.xml +++ b/spring-boot-samples/spring-boot-sample-web-static/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 0.5.0.BUILD-SNAPSHOT + 0.5.0.M1 spring-boot-sample-web-static war diff --git a/spring-boot-samples/spring-boot-sample-web-ui/pom.xml b/spring-boot-samples/spring-boot-sample-web-ui/pom.xml index 9d1394a3664..1c61b25c364 100644 --- a/spring-boot-samples/spring-boot-sample-web-ui/pom.xml +++ b/spring-boot-samples/spring-boot-sample-web-ui/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 0.5.0.BUILD-SNAPSHOT + 0.5.0.M1 spring-boot-sample-web-ui jar diff --git a/spring-boot-samples/spring-boot-sample-xml/pom.xml b/spring-boot-samples/spring-boot-sample-xml/pom.xml index d0deb823778..86808730f88 100644 --- a/spring-boot-samples/spring-boot-sample-xml/pom.xml +++ b/spring-boot-samples/spring-boot-sample-xml/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-samples - 0.5.0.BUILD-SNAPSHOT + 0.5.0.M1 spring-boot-sample-xml jar diff --git a/spring-boot-starters/pom.xml b/spring-boot-starters/pom.xml index 3d8e0cab874..48c8ccef651 100644 --- a/spring-boot-starters/pom.xml +++ b/spring-boot-starters/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-parent - 0.5.0.BUILD-SNAPSHOT + 0.5.0.M1 spring-boot-starters pom diff --git a/spring-boot-starters/spring-boot-starter-actuator/pom.xml b/spring-boot-starters/spring-boot-starter-actuator/pom.xml index 609aa23813a..857d25b8109 100644 --- a/spring-boot-starters/spring-boot-starter-actuator/pom.xml +++ b/spring-boot-starters/spring-boot-starter-actuator/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starters - 0.5.0.BUILD-SNAPSHOT + 0.5.0.M1 spring-boot-starter-actuator jar diff --git a/spring-boot-starters/spring-boot-starter-batch/pom.xml b/spring-boot-starters/spring-boot-starter-batch/pom.xml index b035d3054bf..d7e6517c16b 100644 --- a/spring-boot-starters/spring-boot-starter-batch/pom.xml +++ b/spring-boot-starters/spring-boot-starter-batch/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starters - 0.5.0.BUILD-SNAPSHOT + 0.5.0.M1 spring-boot-starter-batch jar diff --git a/spring-boot-starters/spring-boot-starter-data-jpa/pom.xml b/spring-boot-starters/spring-boot-starter-data-jpa/pom.xml index 2d154930aea..ee6047f45a3 100644 --- a/spring-boot-starters/spring-boot-starter-data-jpa/pom.xml +++ b/spring-boot-starters/spring-boot-starter-data-jpa/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starters - 0.5.0.BUILD-SNAPSHOT + 0.5.0.M1 spring-boot-starter-data-jpa jar diff --git a/spring-boot-starters/spring-boot-starter-integration/pom.xml b/spring-boot-starters/spring-boot-starter-integration/pom.xml index 7182b9cfd5d..fc0e5a3d1fe 100644 --- a/spring-boot-starters/spring-boot-starter-integration/pom.xml +++ b/spring-boot-starters/spring-boot-starter-integration/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starters - 0.5.0.BUILD-SNAPSHOT + 0.5.0.M1 spring-boot-starter-integration jar diff --git a/spring-boot-starters/spring-boot-starter-jetty/pom.xml b/spring-boot-starters/spring-boot-starter-jetty/pom.xml index 606ebbdb056..3bfc6225980 100644 --- a/spring-boot-starters/spring-boot-starter-jetty/pom.xml +++ b/spring-boot-starters/spring-boot-starter-jetty/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starters - 0.5.0.BUILD-SNAPSHOT + 0.5.0.M1 spring-boot-starter-jetty jar diff --git a/spring-boot-starters/spring-boot-starter-logging/pom.xml b/spring-boot-starters/spring-boot-starter-logging/pom.xml index 2c897d257f7..aac68f25f7b 100644 --- a/spring-boot-starters/spring-boot-starter-logging/pom.xml +++ b/spring-boot-starters/spring-boot-starter-logging/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starters - 0.5.0.BUILD-SNAPSHOT + 0.5.0.M1 spring-boot-starter-logging jar diff --git a/spring-boot-starters/spring-boot-starter-parent/pom.xml b/spring-boot-starters/spring-boot-starter-parent/pom.xml index 69c43a80975..084ad71e314 100644 --- a/spring-boot-starters/spring-boot-starter-parent/pom.xml +++ b/spring-boot-starters/spring-boot-starter-parent/pom.xml @@ -19,7 +19,7 @@ NOTE: If you are editing a local checkout of this file, be sure to modify org.springframework.boot spring-boot-starter-parent - 0.5.0.BUILD-SNAPSHOT + 0.5.0.M1 pom @@ -27,8 +27,17 @@ NOTE: If you are editing a local checkout of this file, be sure to modify 1.6 UTF-8 UTF-8 - 4.0.0.BUILD-SNAPSHOT - 0.5.0.BUILD-SNAPSHOT + 4.0.0.M2 + 3.2.0.M2 + 2.2.4.RELEASE + 2.2.0.RELEASE + 2.1.6 + 1.6 + 7.0.42 + 8.1.9.v20130131 + 1.7.3 + 1.0.0.M1 + 0.5.0.M1 diff --git a/spring-boot-starters/spring-boot-starter-security/pom.xml b/spring-boot-starters/spring-boot-starter-security/pom.xml index 201bf3b3e7c..60d5d3cc3b6 100644 --- a/spring-boot-starters/spring-boot-starter-security/pom.xml +++ b/spring-boot-starters/spring-boot-starter-security/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starters - 0.5.0.BUILD-SNAPSHOT + 0.5.0.M1 spring-boot-starter-security jar diff --git a/spring-boot-starters/spring-boot-starter-tomcat/pom.xml b/spring-boot-starters/spring-boot-starter-tomcat/pom.xml index 6113c306995..f4dbd53bcf6 100644 --- a/spring-boot-starters/spring-boot-starter-tomcat/pom.xml +++ b/spring-boot-starters/spring-boot-starter-tomcat/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starters - 0.5.0.BUILD-SNAPSHOT + 0.5.0.M1 spring-boot-starter-tomcat jar diff --git a/spring-boot-starters/spring-boot-starter-web/pom.xml b/spring-boot-starters/spring-boot-starter-web/pom.xml index c1dd6be9de3..8b795e49a15 100644 --- a/spring-boot-starters/spring-boot-starter-web/pom.xml +++ b/spring-boot-starters/spring-boot-starter-web/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starters - 0.5.0.BUILD-SNAPSHOT + 0.5.0.M1 spring-boot-starter-web jar diff --git a/spring-boot-starters/spring-boot-starter/pom.xml b/spring-boot-starters/spring-boot-starter/pom.xml index 28491768d9d..7d310df312d 100644 --- a/spring-boot-starters/spring-boot-starter/pom.xml +++ b/spring-boot-starters/spring-boot-starter/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starters - 0.5.0.BUILD-SNAPSHOT + 0.5.0.M1 spring-boot-starter jar diff --git a/spring-boot-starters/src/main/parent/pom.xml b/spring-boot-starters/src/main/parent/pom.xml index 9d48442267b..9e9be3deae7 100644 --- a/spring-boot-starters/src/main/parent/pom.xml +++ b/spring-boot-starters/src/main/parent/pom.xml @@ -19,7 +19,7 @@ NOTE: If you are editing a local checkout of this file, be sure to modify org.springframework.boot spring-boot-starter-parent - 0.5.0.BUILD-SNAPSHOT + 0.5.0.M1 pom @@ -27,7 +27,16 @@ NOTE: If you are editing a local checkout of this file, be sure to modify 1.6 UTF-8 UTF-8 - 4.0.0.BUILD-SNAPSHOT + @{spring.version} + @{spring.security.version} + @{spring.integration.version} + @{spring.batch.version} + @{groovy.version} + @{gradle.version} + @{tomcat.version} + @{jetty.version} + @{aspectj.version} + @{reactor.version} @{project.version} diff --git a/spring-boot/pom.xml b/spring-boot/pom.xml index 05e4b95ef25..43cae6ee90f 100644 --- a/spring-boot/pom.xml +++ b/spring-boot/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-parent - 0.5.0.BUILD-SNAPSHOT + 0.5.0.M1 spring-boot jar