Merge branch '3.2.x' into 3.3.x

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-ant/build.xml

@@ -29,11 +29,11 @@
 	</target>
 
 	<target name="init" depends="classpaths">
-		<mkdir dir="build/ant/classes" />
+		<mkdir dir="${basedir}/classes" />
 	</target>
 
 	<target name="compile" depends="init" description="compile">
-		<javac srcdir="${projectDir}/src/main/java" destdir="build/ant/classes" classpathref="compile.classpath" fork="true" includeantruntime="false" source="8" target="8" compiler="javac1.8"/>
+		<javac srcdir="${projectDir}/src/main/java" destdir="${basedir}/classes" classpathref="compile.classpath" fork="true" includeantruntime="false" source="8" target="8" compiler="javac1.8"/>
 	</target>
 
 	<target name="clean" description="cleans all created files/dirs">
@@ -42,8 +42,8 @@
 	</target>
 
 	<target name="build" depends="compile">
-		<delete file="build/ant/libs/${ant.project.name}.jar"/>
-		<spring-boot:exejar destfile="build/ant/libs/${ant.project.name}.jar" classes="build/ant/classes">
+		<delete file="${basedir}/libs/${ant.project.name}.jar"/>
+		<spring-boot:exejar destfile="${basedir}/libs/${ant.project.name}.jar" classes="${basedir}/classes">
 			<spring-boot:lib>
 				<fileset dir="${lib.dir}/runtime" />
 			</spring-boot:lib>
@@ -54,7 +54,7 @@
 	<target name="manual" depends="compile">
 		<jar destfile="target/${ant.project.name}-${ant-spring-boot.version}.jar" compress="false">
 			<mappedresources>
-				<fileset dir="build/ant/classes" />
+				<fileset dir="${basedir}/classes" />
 				<globmapper from="*" to="BOOT-INF/classes/*"/>
 			</mappedresources>
 			<mappedresources>