From 9327b58304f6f1e9ffa11bdfd91eba3d65a70729 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Fri, 21 Apr 2017 11:26:45 +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-ant/build.xml  |  2 +-
 spring-boot-samples/spring-boot-sample-ant/pom.xml    | 11 +++++------
 .../spring-boot-sample-logback/build.gradle           |  2 +-
 .../spring-boot-sample-profile/build.gradle           |  2 +-
 .../spring-boot-sample-simple/build.gradle            |  2 +-
 .../spring-boot-sample-web-static/build.gradle        |  2 +-
 .../spring-boot-sample-web-ui/build.gradle            |  2 +-
 .../spring-boot-starter-parent/pom.xml                |  9 ++++-----
 10 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index 234696b6b28..276eb5f1f76 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>
@@ -2415,7 +2414,7 @@
 				<plugin>
 					<groupId>org.springframework.boot</groupId>
 					<artifactId>spring-boot-maven-plugin</artifactId>
-					<version>1.5.3.BUILD-SNAPSHOT</version>
+					<version>1.5.4.BUILD-SNAPSHOT</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
@@ -2636,4 +2635,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 2eeaee8377c..6355f46a623 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.5.3.BUILD-SNAPSHOT'
+		springBootVersion = '1.5.4.BUILD-SNAPSHOT'
 	}
 	repositories {
 		// NOTE: You should declare only repositories that you need here
diff --git a/spring-boot-samples/spring-boot-sample-ant/build.xml b/spring-boot-samples/spring-boot-sample-ant/build.xml
index e14ef991034..9e951601007 100644
--- a/spring-boot-samples/spring-boot-sample-ant/build.xml
+++ b/spring-boot-samples/spring-boot-sample-ant/build.xml
@@ -11,7 +11,7 @@
 		actual jars). Run with '$ java -jar target/*.jar'.
 	</description>
 
-	<property name="spring-boot.version" value="1.5.3.BUILD-SNAPSHOT" />
+	<property name="spring-boot.version" value="1.5.4.BUILD-SNAPSHOT" />
 	<property name="lib.dir" location="${basedir}/target/lib" />
 	<property name="start-class" value="sample.ant.SampleAntApplication" />
 
diff --git a/spring-boot-samples/spring-boot-sample-ant/pom.xml b/spring-boot-samples/spring-boot-sample-ant/pom.xml
index 356d4fdb510..680aac17847 100644
--- a/spring-boot-samples/spring-boot-sample-ant/pom.xml
+++ b/spring-boot-samples/spring-boot-sample-ant/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">
 	<!-- This POM is just to trigger the Ant/Ivy sample from Maven and to test -->
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
@@ -62,8 +61,8 @@
 						<phase>package</phase>
 						<configuration>
 							<target>
-								<property name="build.compiler" value="extJavac" />
-								<ant dir="${basedir}" />
+								<property name="build.compiler" value="extJavac"/>
+								<ant dir="${basedir}"/>
 							</target>
 						</configuration>
 						<goals>
@@ -85,7 +84,7 @@
 					<dependency>
 						<groupId>org.springframework.boot</groupId>
 						<artifactId>spring-boot-antlib</artifactId>
-						<version>1.5.3.BUILD-SNAPSHOT</version>
+						<version>1.5.4.BUILD-SNAPSHOT</version>
 					</dependency>
 				</dependencies>
 			</plugin>
@@ -103,4 +102,4 @@
 			</plugin>
 		</plugins>
 	</build>
-</project>
+</project>
\ No newline at end of file
diff --git a/spring-boot-samples/spring-boot-sample-logback/build.gradle b/spring-boot-samples/spring-boot-sample-logback/build.gradle
index 0d6e903f942..897fdabbce8 100644
--- a/spring-boot-samples/spring-boot-sample-logback/build.gradle
+++ b/spring-boot-samples/spring-boot-sample-logback/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
 	ext {
-		springBootVersion = '1.5.3.BUILD-SNAPSHOT'
+		springBootVersion = '1.5.4.BUILD-SNAPSHOT'
 	}
 	repositories {
 		// NOTE: You should declare only repositories that you need here
diff --git a/spring-boot-samples/spring-boot-sample-profile/build.gradle b/spring-boot-samples/spring-boot-sample-profile/build.gradle
index 0bea8aef907..0418e63b416 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.5.3.BUILD-SNAPSHOT'
+		springBootVersion = '1.5.4.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 0d6e903f942..897fdabbce8 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.5.3.BUILD-SNAPSHOT'
+		springBootVersion = '1.5.4.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 fffb10fab64..4bb307c9f47 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.5.3.BUILD-SNAPSHOT'
+		springBootVersion = '1.5.4.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 7509dedfdff..b391974b817 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.5.3.BUILD-SNAPSHOT'
+		springBootVersion = '1.5.4.BUILD-SNAPSHOT'
 		springLoadedVersion = '1.2.4.RELEASE'
 	}
 	repositories {
diff --git a/spring-boot-starters/spring-boot-starter-parent/pom.xml b/spring-boot-starters/spring-boot-starter-parent/pom.xml
index c1a6e6bad7c..9d21f55b7b9 100644
--- a/spring-boot-starters/spring-boot-starter-parent/pom.xml
+++ b/spring-boot-starters/spring-boot-starter-parent/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>
 	<parent>
 		<groupId>org.springframework.boot</groupId>
@@ -172,7 +171,7 @@
 						<dependency>
 							<groupId>org.springframework.boot</groupId>
 							<artifactId>spring-boot-maven-plugin</artifactId>
-							<version>1.5.3.BUILD-SNAPSHOT</version>
+							<version>1.5.4.BUILD-SNAPSHOT</version>
 						</dependency>
 					</dependencies>
 					<configuration>
@@ -206,7 +205,7 @@
 									<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
 										<resource>META-INF/spring.schemas</resource>
 									</transformer>
-									<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
+									<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
 									<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
 										<mainClass>${start-class}</mainClass>
 									</transformer>
@@ -218,4 +217,4 @@
 			</plugins>
 		</pluginManagement>
 	</build>
-</project>
+</project>
\ No newline at end of file