From b847b6fa4b4396e1d6ae695678862d21d4b27beb Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Thu, 4 Jun 2015 10:34:44 +0200
Subject: [PATCH] Fixup version numbers following release

---
 spring-boot-dependencies/pom.xml                           | 7 +++----
 .../spring-boot-sample-actuator/build.gradle               | 2 +-
 spring-boot-samples/spring-boot-sample-actuator/build.xml  | 2 +-
 .../spring-boot-sample-profile/build.gradle                | 2 +-
 spring-boot-samples/spring-boot-sample-simple/build.gradle | 2 +-
 .../spring-boot-sample-web-static/build.gradle             | 2 +-
 spring-boot-samples/spring-boot-sample-web-ui/build.gradle | 2 +-
 7 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index 7f7ab3ebb1..5c71c43768 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.boot</groupId>
 	<artifactId>spring-boot-dependencies</artifactId>
@@ -45,7 +44,7 @@
 	</developers>
 	<properties>
 		<!-- Spring Boot -->
-		<spring-boot.version>1.2.4.BUILD-SNAPSHOT</spring-boot.version>
+		<spring-boot.version>1.2.5.BUILD-SNAPSHOT</spring-boot.version>
 		<!-- Third Party -->
 		<activemq.version>5.10.2</activemq.version>
 		<antlr2.version>2.7.7</antlr2.version>
@@ -1687,4 +1686,4 @@
 			<id>integration-test</id>
 		</profile>
 	</profiles>
-</project>
+</project>
\ No newline at end of file
diff --git a/spring-boot-samples/spring-boot-sample-actuator/build.gradle b/spring-boot-samples/spring-boot-sample-actuator/build.gradle
index 2eff15949a..76835bc6cc 100644
--- a/spring-boot-samples/spring-boot-sample-actuator/build.gradle
+++ b/spring-boot-samples/spring-boot-sample-actuator/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
 	ext {
-		springBootVersion = '1.2.4.BUILD-SNAPSHOT'
+		springBootVersion = '1.2.5.BUILD-SNAPSHOT'
 	}
 	repositories {
 		// NOTE: You should declare only repositories that you need here
diff --git a/spring-boot-samples/spring-boot-sample-actuator/build.xml b/spring-boot-samples/spring-boot-sample-actuator/build.xml
index 1e20908a45..4c50eb63d7 100644
--- a/spring-boot-samples/spring-boot-sample-actuator/build.xml
+++ b/spring-boot-samples/spring-boot-sample-actuator/build.xml
@@ -5,7 +5,7 @@
 		'$ ant -lib ivy-2.2.jar' (substitute the location of your actual ivy jar). Run with '$ java -jar target/*.jar'. 
 	</description>
 
-	<property name="spring-boot.version" value="1.2.4.BUILD-SNAPSHOT" />
+	<property name="spring-boot.version" value="1.2.5.BUILD-SNAPSHOT" />
 	<property name="start-class" value="org.springframework.boot.sample.actuator.SampleActuatorApplication" />
 
 	<target name="resolve" description="--> retrieve dependencies with ivy">
diff --git a/spring-boot-samples/spring-boot-sample-profile/build.gradle b/spring-boot-samples/spring-boot-sample-profile/build.gradle
index ac178447ad..535b8a6f0a 100644
--- a/spring-boot-samples/spring-boot-sample-profile/build.gradle
+++ b/spring-boot-samples/spring-boot-sample-profile/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
 	ext {
-		springBootVersion = '1.2.4.BUILD-SNAPSHOT'
+		springBootVersion = '1.2.5.BUILD-SNAPSHOT'
 	}
 	repositories {
 		// NOTE: You should declare only repositories that you need here
diff --git a/spring-boot-samples/spring-boot-sample-simple/build.gradle b/spring-boot-samples/spring-boot-sample-simple/build.gradle
index b983a4cbde..c26ca8d36d 100644
--- a/spring-boot-samples/spring-boot-sample-simple/build.gradle
+++ b/spring-boot-samples/spring-boot-sample-simple/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
 	ext {
-		springBootVersion = '1.2.4.BUILD-SNAPSHOT'
+		springBootVersion = '1.2.5.BUILD-SNAPSHOT'
 	}
 	repositories {
 		// NOTE: You should declare only repositories that you need here
diff --git a/spring-boot-samples/spring-boot-sample-web-static/build.gradle b/spring-boot-samples/spring-boot-sample-web-static/build.gradle
index 19cc7e7a45..072ce5c12a 100644
--- a/spring-boot-samples/spring-boot-sample-web-static/build.gradle
+++ b/spring-boot-samples/spring-boot-sample-web-static/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
 	ext {
-		springBootVersion = '1.2.4.BUILD-SNAPSHOT'
+		springBootVersion = '1.2.5.BUILD-SNAPSHOT'
 	}
 	repositories {
 		// NOTE: You should declare only repositories that you need here
diff --git a/spring-boot-samples/spring-boot-sample-web-ui/build.gradle b/spring-boot-samples/spring-boot-sample-web-ui/build.gradle
index 84eb96266e..d35cd2c940 100644
--- a/spring-boot-samples/spring-boot-sample-web-ui/build.gradle
+++ b/spring-boot-samples/spring-boot-sample-web-ui/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
 	ext {
-		springBootVersion = '1.2.4.BUILD-SNAPSHOT'
+		springBootVersion = '1.2.5.BUILD-SNAPSHOT'
 		springLoadedVersion = '1.2.0.RELEASE'
 	}
 	repositories {