From 041d8b39d08c61b1423926883ef4986b957f9709 Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@pivotal.io>
Date: Fri, 4 Aug 2017 21:10:23 -0700
Subject: [PATCH] Fix Ant builds following Maven updates

Update `spring-boot-sample-ant` so that it works with the CI friendly
Maven POMs.

See gh-9316
---
 spring-boot-samples/spring-boot-sample-ant/build.xml | 8 ++++----
 spring-boot-samples/spring-boot-sample-ant/ivy.xml   | 4 ++--
 spring-boot-samples/spring-boot-sample-ant/pom.xml   | 4 ++++
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/spring-boot-samples/spring-boot-sample-ant/build.xml b/spring-boot-samples/spring-boot-sample-ant/build.xml
index 3ae6871618..68c7b752dc 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="2.0.0.BUILD-SNAPSHOT" />
+	<property name="ant-spring-boot.version" value="${revision}" />
 	<property name="lib.dir" location="${basedir}/target/lib" />
 	<property name="start-class" value="sample.ant.SampleAntApplication" />
 
@@ -38,7 +38,7 @@
 	</target>
 
 	<target name="build" depends="compile">
-		<spring-boot:exejar destfile="target/${ant.project.name}-${spring-boot.version}.jar" classes="target/classes">
+		<spring-boot:exejar destfile="target/${ant.project.name}-${ant-spring-boot.version}.jar" classes="target/classes">
 			<spring-boot:lib>
 				<fileset dir="${lib.dir}/runtime" />
 			</spring-boot:lib>
@@ -46,7 +46,7 @@
 	</target>
 	<!-- Manual equivalent of the build target -->
 	<target name="manual" depends="compile">
-		<jar destfile="target/${ant.project.name}-${spring-boot.version}.jar" compress="false">
+		<jar destfile="target/${ant.project.name}-${ant-spring-boot.version}.jar" compress="false">
 			<mappedresources>
 				<fileset dir="target/classes" />
 				<globmapper from="*" to="BOOT-INF/classes/*"/>
@@ -59,7 +59,7 @@
 				<fileset dir="${lib.dir}/runtime" />
 				<globmapper from="*" to="BOOT-INF/lib/*"/>
 			</mappedresources>
-			<zipfileset src="${lib.dir}/loader/spring-boot-loader-jar-${spring-boot.version}.jar" />
+			<zipfileset src="${lib.dir}/loader/spring-boot-loader-jar-${ant-spring-boot.version}.jar" />
 			<manifest>
 				<attribute name="Main-Class" value="org.springframework.boot.loader.JarLauncher" />
 				<attribute name="Start-Class" value="${start-class}" />
diff --git a/spring-boot-samples/spring-boot-sample-ant/ivy.xml b/spring-boot-samples/spring-boot-sample-ant/ivy.xml
index 8a65900699..a09621d5ba 100644
--- a/spring-boot-samples/spring-boot-sample-ant/ivy.xml
+++ b/spring-boot-samples/spring-boot-sample-ant/ivy.xml
@@ -6,7 +6,7 @@
 		<conf name="loader" description="Spring Boot loader used when manually building an executable archive" />
 	</configurations>
 	<dependencies>
-		<dependency org="org.springframework.boot" name="spring-boot-starter" rev="${spring-boot.version}" conf="compile" />
-		<dependency org="org.springframework.boot" name="spring-boot-loader" rev="${spring-boot.version}" conf="loader->default" />
+		<dependency org="org.springframework.boot" name="spring-boot-starter" rev="${ant-spring-boot.version}" conf="compile" />
+		<dependency org="org.springframework.boot" name="spring-boot-loader" rev="${ant-spring-boot.version}" conf="loader->default" />
 	</dependencies>
 </ivy-module>
diff --git a/spring-boot-samples/spring-boot-sample-ant/pom.xml b/spring-boot-samples/spring-boot-sample-ant/pom.xml
index 174408e951..cb52d09649 100644
--- a/spring-boot-samples/spring-boot-sample-ant/pom.xml
+++ b/spring-boot-samples/spring-boot-sample-ant/pom.xml
@@ -21,6 +21,10 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-loader</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>