Bump version to 0.5.0.M1

boostrack · Aug 2, 2013 · 68e5a7e · 68e5a7e
1 parent fda537d
commit 68e5a7e
Show file tree

Hide file tree

Showing 39 changed files with 61 additions and 44 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.boot</groupId>
 	<artifactId>spring-boot-parent</artifactId>
-	<version>0.5.0.BUILD-SNAPSHOT</version>
+	<version>0.5.0.M1</version>
 	<packaging>pom</packaging>
 	<prerequisites>
 		<maven>3.0.0</maven>
@@ -14,7 +14,7 @@
 		<java.version>1.6</java.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<maven.version>3.0.5</maven.version>
-		<spring.version>4.0.0.BUILD-SNAPSHOT</spring.version>
+		<spring.version>4.0.0.M2</spring.version>
 		<spring.security.version>3.2.0.M2</spring.security.version>
 		<spring.integration.version>2.2.4.RELEASE</spring.integration.version>
 		<spring.batch.version>2.2.0.RELEASE</spring.batch.version>

diff --git a/spring-boot-actuator/pom.xml b/spring-boot-actuator/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-parent</artifactId>
-		<version>0.5.0.BUILD-SNAPSHOT</version>
+		<version>0.5.0.M1</version>
 	</parent>
 	<artifactId>spring-boot-actuator</artifactId>
 	<packaging>jar</packaging>

diff --git a/spring-boot-autoconfigure/pom.xml b/spring-boot-autoconfigure/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-parent</artifactId>
-		<version>0.5.0.BUILD-SNAPSHOT</version>
+		<version>0.5.0.M1</version>
 	</parent>
 	<artifactId>spring-boot-autoconfigure</artifactId>
 	<packaging>jar</packaging>

diff --git a/spring-boot-cli/pom.xml b/spring-boot-cli/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-parent</artifactId>
-		<version>0.5.0.BUILD-SNAPSHOT</version>
+		<version>0.5.0.M1</version>
 	</parent>
 	<artifactId>spring-boot-cli</artifactId>
 	<packaging>jar</packaging>

diff --git a/spring-boot-gradle-plugin/pom.xml b/spring-boot-gradle-plugin/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-parent</artifactId>
-		<version>0.5.0.BUILD-SNAPSHOT</version>
+		<version>0.5.0.M1</version>
 	</parent>
 	<artifactId>spring-boot-gradle-plugin</artifactId>
 	<properties>

diff --git a/spring-boot-integration-tests/pom.xml b/spring-boot-integration-tests/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-parent</artifactId>
-		<version>0.5.0.BUILD-SNAPSHOT</version>
+		<version>0.5.0.M1</version>
 	</parent>
 	<artifactId>spring-boot-integration-tests</artifactId>
 	<packaging>pom</packaging>

diff --git a/spring-boot-loader-tools/pom.xml b/spring-boot-loader-tools/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-parent</artifactId>
-		<version>0.5.0.BUILD-SNAPSHOT</version>
+		<version>0.5.0.M1</version>
 	</parent>
 	<artifactId>spring-boot-loader-tools</artifactId>
 	<packaging>jar</packaging>

diff --git a/.../test/resources/META-INF/maven/org.springframework.boot/spring-boot-sample-tomcat/pom.xml b/.../test/resources/META-INF/maven/org.springframework.boot/spring-boot-sample-tomcat/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-samples</artifactId>
-		<version>0.5.0.BUILD-SNAPSHOT</version>
+		<version>0.5.0.M1</version>
 	</parent>
 	<artifactId>spring-boot-sample-tomcat</artifactId>
 	<packaging>jar</packaging>

diff --git a/spring-boot-loader/pom.xml b/spring-boot-loader/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-parent</artifactId>
-		<version>0.5.0.BUILD-SNAPSHOT</version>
+		<version>0.5.0.M1</version>
 	</parent>
 	<artifactId>spring-boot-loader</artifactId>
 	<packaging>jar</packaging>

diff --git a/spring-boot-maven-plugin/pom.xml b/spring-boot-maven-plugin/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-parent</artifactId>
-		<version>0.5.0.BUILD-SNAPSHOT</version>
+		<version>0.5.0.M1</version>
 	</parent>
 	<artifactId>spring-boot-maven-plugin</artifactId>
 	<packaging>maven-plugin</packaging>

diff --git a/spring-boot-samples/pom.xml b/spring-boot-samples/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-parent</artifactId>
-		<version>0.5.0.BUILD-SNAPSHOT</version>
+		<version>0.5.0.M1</version>
 	</parent>
 	<artifactId>spring-boot-samples</artifactId>
 	<packaging>pom</packaging>

diff --git 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 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-samples</artifactId>
-		<version>0.5.0.BUILD-SNAPSHOT</version>
+		<version>0.5.0.M1</version>
 	</parent>
 	<artifactId>spring-boot-sample-actuator-ui</artifactId>
 	<packaging>jar</packaging>

diff --git a/spring-boot-samples/spring-boot-sample-actuator/pom.xml b/spring-boot-samples/spring-boot-sample-actuator/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-samples</artifactId>
-		<version>0.5.0.BUILD-SNAPSHOT</version>
+		<version>0.5.0.M1</version>
 	</parent>
 	<artifactId>spring-boot-sample-actuator</artifactId>
 	<packaging>jar</packaging>

diff --git a/spring-boot-samples/spring-boot-sample-batch/pom.xml b/spring-boot-samples/spring-boot-sample-batch/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-samples</artifactId>
-		<version>0.5.0.BUILD-SNAPSHOT</version>
+		<version>0.5.0.M1</version>
 	</parent>
 	<artifactId>spring-boot-sample-batch</artifactId>
 	<packaging>jar</packaging>

diff --git 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 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-samples</artifactId>
-		<version>0.5.0.BUILD-SNAPSHOT</version>
+		<version>0.5.0.M1</version>
 	</parent>
 	<artifactId>spring-boot-sample-data-jpa</artifactId>
 	<packaging>jar</packaging>

diff --git a/...src/test/java/org/springframework/boot/sample/data/jpa/SampleDataJpaApplicationTests.java b/...src/test/java/org/springframework/boot/sample/data/jpa/SampleDataJpaApplicationTests.java
@@ -26,7 +26,6 @@
 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 ConfigurableApplicationContext call() throws Exception {
 										.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
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-samples</artifactId>
-		<version>0.5.0.BUILD-SNAPSHOT</version>
+		<version>0.5.0.M1</version>
 	</parent>
 	<artifactId>spring-boot-sample-integration</artifactId>
 	<packaging>jar</packaging>

diff --git a/spring-boot-samples/spring-boot-sample-jetty/pom.xml b/spring-boot-samples/spring-boot-sample-jetty/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-samples</artifactId>
-		<version>0.5.0.BUILD-SNAPSHOT</version>
+		<version>0.5.0.M1</version>
 	</parent>
 	<artifactId>spring-boot-sample-jetty</artifactId>
 	<packaging>jar</packaging>

diff --git a/spring-boot-samples/spring-boot-sample-profile/pom.xml b/spring-boot-samples/spring-boot-sample-profile/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-samples</artifactId>
-		<version>0.5.0.BUILD-SNAPSHOT</version>
+		<version>0.5.0.M1</version>
 	</parent>
 	<artifactId>spring-boot-sample-profile</artifactId>
 	<packaging>jar</packaging>

diff --git a/spring-boot-samples/spring-boot-sample-simple/pom.xml b/spring-boot-samples/spring-boot-sample-simple/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-samples</artifactId>
-		<version>0.5.0.BUILD-SNAPSHOT</version>
+		<version>0.5.0.M1</version>
 	</parent>
 	<artifactId>spring-boot-sample-simple</artifactId>
 	<packaging>jar</packaging>

diff --git a/spring-boot-samples/spring-boot-sample-tomcat/pom.xml b/spring-boot-samples/spring-boot-sample-tomcat/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-samples</artifactId>
-		<version>0.5.0.BUILD-SNAPSHOT</version>
+		<version>0.5.0.M1</version>
 	</parent>
 	<artifactId>spring-boot-sample-tomcat</artifactId>
 	<packaging>jar</packaging>

diff --git a/spring-boot-samples/spring-boot-sample-traditional/pom.xml b/spring-boot-samples/spring-boot-sample-traditional/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-samples</artifactId>
-		<version>0.5.0.BUILD-SNAPSHOT</version>
+		<version>0.5.0.M1</version>
 	</parent>
 	<artifactId>spring-boot-sample-traditional</artifactId>
 	<packaging>war</packaging>

diff --git 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 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-samples</artifactId>
-		<version>0.5.0.BUILD-SNAPSHOT</version>
+		<version>0.5.0.M1</version>
 	</parent>
 	<artifactId>spring-boot-sample-web-static</artifactId>
 	<packaging>war</packaging>

diff --git 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 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-samples</artifactId>
-		<version>0.5.0.BUILD-SNAPSHOT</version>
+		<version>0.5.0.M1</version>
 	</parent>
 	<artifactId>spring-boot-sample-web-ui</artifactId>
 	<packaging>jar</packaging>

diff --git a/spring-boot-samples/spring-boot-sample-xml/pom.xml b/spring-boot-samples/spring-boot-sample-xml/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-samples</artifactId>
-		<version>0.5.0.BUILD-SNAPSHOT</version>
+		<version>0.5.0.M1</version>
 	</parent>
 	<artifactId>spring-boot-sample-xml</artifactId>
 	<packaging>jar</packaging>

diff --git a/spring-boot-starters/pom.xml b/spring-boot-starters/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-parent</artifactId>
-		<version>0.5.0.BUILD-SNAPSHOT</version>
+		<version>0.5.0.M1</version>
 	</parent>
 	<artifactId>spring-boot-starters</artifactId>
 	<packaging>pom</packaging>

diff --git a/spring-boot-starters/spring-boot-starter-actuator/pom.xml b/spring-boot-starters/spring-boot-starter-actuator/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starters</artifactId>
-		<version>0.5.0.BUILD-SNAPSHOT</version>
+		<version>0.5.0.M1</version>
 	</parent>
 	<artifactId>spring-boot-starter-actuator</artifactId>
 	<packaging>jar</packaging>

diff --git a/spring-boot-starters/spring-boot-starter-batch/pom.xml b/spring-boot-starters/spring-boot-starter-batch/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starters</artifactId>
-		<version>0.5.0.BUILD-SNAPSHOT</version>
+		<version>0.5.0.M1</version>
 	</parent>
 	<artifactId>spring-boot-starter-batch</artifactId>
 	<packaging>jar</packaging>

diff --git 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 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starters</artifactId>
-		<version>0.5.0.BUILD-SNAPSHOT</version>
+		<version>0.5.0.M1</version>
 	</parent>
 	<artifactId>spring-boot-starter-data-jpa</artifactId>
 	<packaging>jar</packaging>

diff --git a/spring-boot-starters/spring-boot-starter-integration/pom.xml b/spring-boot-starters/spring-boot-starter-integration/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starters</artifactId>
-		<version>0.5.0.BUILD-SNAPSHOT</version>
+		<version>0.5.0.M1</version>
 	</parent>
 	<artifactId>spring-boot-starter-integration</artifactId>
 	<packaging>jar</packaging>

diff --git a/spring-boot-starters/spring-boot-starter-jetty/pom.xml b/spring-boot-starters/spring-boot-starter-jetty/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starters</artifactId>
-		<version>0.5.0.BUILD-SNAPSHOT</version>
+		<version>0.5.0.M1</version>
 	</parent>
 	<artifactId>spring-boot-starter-jetty</artifactId>
 	<packaging>jar</packaging>

diff --git a/spring-boot-starters/spring-boot-starter-logging/pom.xml b/spring-boot-starters/spring-boot-starter-logging/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starters</artifactId>
-		<version>0.5.0.BUILD-SNAPSHOT</version>
+		<version>0.5.0.M1</version>
 	</parent>
 	<artifactId>spring-boot-starter-logging</artifactId>
 	<packaging>jar</packaging>

diff --git a/spring-boot-starters/spring-boot-starter-parent/pom.xml b/spring-boot-starters/spring-boot-starter-parent/pom.xml
@@ -19,16 +19,25 @@ NOTE: If you are editing a local checkout of this file, be sure to modify
 	<!-- Intentionally do not inherit from boot-parent -->
 	<groupId>org.springframework.boot</groupId>
 	<artifactId>spring-boot-starter-parent</artifactId>
-	<version>0.5.0.BUILD-SNAPSHOT</version>
+	<version>0.5.0.M1</version>
 
 	<packaging>pom</packaging>
 
 	<properties>
 		<java.version>1.6</java.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<spring.version>4.0.0.BUILD-SNAPSHOT</spring.version>
-		<spring.boot.version>0.5.0.BUILD-SNAPSHOT</spring.boot.version>
+		<spring.version>4.0.0.M2</spring.version>
+		<spring.security.version>3.2.0.M2</spring.security.version>
+		<spring.integration.version>2.2.4.RELEASE</spring.integration.version>
+		<spring.batch.version>2.2.0.RELEASE</spring.batch.version>
+		<groovy.version>2.1.6</groovy.version>
+		<gradle.version>1.6</gradle.version>
+		<tomcat.version>7.0.42</tomcat.version>
+		<jetty.version>8.1.9.v20130131</jetty.version>
+		<aspectj.version>1.7.3</aspectj.version>
+		<reactor.version>1.0.0.M1</reactor.version>
+		<spring.boot.version>0.5.0.M1</spring.boot.version>
 	</properties>
 
 	<prerequisites>

diff --git a/spring-boot-starters/spring-boot-starter-security/pom.xml b/spring-boot-starters/spring-boot-starter-security/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starters</artifactId>
-		<version>0.5.0.BUILD-SNAPSHOT</version>
+		<version>0.5.0.M1</version>
 	</parent>
 	<artifactId>spring-boot-starter-security</artifactId>
 	<packaging>jar</packaging>

diff --git a/spring-boot-starters/spring-boot-starter-tomcat/pom.xml b/spring-boot-starters/spring-boot-starter-tomcat/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starters</artifactId>
-		<version>0.5.0.BUILD-SNAPSHOT</version>
+		<version>0.5.0.M1</version>
 	</parent>
 	<artifactId>spring-boot-starter-tomcat</artifactId>
 	<packaging>jar</packaging>

diff --git a/spring-boot-starters/spring-boot-starter-web/pom.xml b/spring-boot-starters/spring-boot-starter-web/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starters</artifactId>
-		<version>0.5.0.BUILD-SNAPSHOT</version>
+		<version>0.5.0.M1</version>
 	</parent>
 	<artifactId>spring-boot-starter-web</artifactId>
 	<packaging>jar</packaging>

diff --git a/spring-boot-starters/spring-boot-starter/pom.xml b/spring-boot-starters/spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starters</artifactId>
-		<version>0.5.0.BUILD-SNAPSHOT</version>
+		<version>0.5.0.M1</version>
 	</parent>
 	<artifactId>spring-boot-starter</artifactId>
 	<packaging>jar</packaging>

diff --git a/spring-boot-starters/src/main/parent/pom.xml b/spring-boot-starters/src/main/parent/pom.xml
@@ -19,15 +19,24 @@ NOTE: If you are editing a local checkout of this file, be sure to modify
 	<!-- Intentionally do not inherit from boot-parent -->
 	<groupId>org.springframework.boot</groupId>
 	<artifactId>spring-boot-starter-parent</artifactId>
-	<version>0.5.0.BUILD-SNAPSHOT</version>
+	<version>0.5.0.M1</version>
 
 	<packaging>pom</packaging>
 
 	<properties>
 		<java.version>1.6</java.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<spring.version>4.0.0.BUILD-SNAPSHOT</spring.version>
+		<spring.version>@{spring.version}</spring.version>
+		<spring.security.version>@{spring.security.version}</spring.security.version>
+		<spring.integration.version>@{spring.integration.version}</spring.integration.version>
+		<spring.batch.version>@{spring.batch.version}</spring.batch.version>
+		<groovy.version>@{groovy.version}</groovy.version>
+		<gradle.version>@{gradle.version}</gradle.version>
+		<tomcat.version>@{tomcat.version}</tomcat.version>
+		<jetty.version>@{jetty.version}</jetty.version>
+		<aspectj.version>@{aspectj.version}</aspectj.version>
+		<reactor.version>@{reactor.version}</reactor.version>
 		<spring.boot.version>@{project.version}</spring.boot.version>
 	</properties>