Merge branch '2.3.x'

Closes gh-22783

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

@@ -11,7 +11,7 @@
 		actual jars). Run with '$ java -jar target/*.jar'.
 	</description>
 
-	<property name="lib.dir" location="${basedir}/target/lib" />
+	<property name="lib.dir" location="${basedir}/build/ant/lib" />
 	<property name="start-class" value="smoketest.ant.SampleAntApplication" />
 
 	<target name="resolve" description="--> retrieve dependencies with ivy">
@@ -37,7 +37,7 @@
 	</target>
 
 	<target name="build" depends="compile">
-		<spring-boot:exejar destfile="build/ant/libs/${ant.project.name}-${ant-spring-boot.version}.jar" classes="build/ant/classes">
+		<spring-boot:exejar destfile="build/ant/libs/${ant.project.name}.jar" classes="build/ant/classes">
 			<spring-boot:lib>
 				<fileset dir="${lib.dir}/runtime" />
 			</spring-boot:lib>

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-ant/src/test/java/smoketest/ant/SampleAntApplicationIT.java

@@ -17,7 +17,6 @@
 package smoketest.ant;
 
 import java.io.File;
-import java.io.FileFilter;
 import java.io.InputStreamReader;
 import java.util.concurrent.TimeUnit;
 
@@ -38,17 +37,9 @@ public class SampleAntApplicationIT {
 
 	@Test
 	void runJar() throws Exception {
-		File target = new File("build/ant/libs");
+		File libs = new File("build/ant/libs");
-		File[] jarFiles = target.listFiles(new FileFilter() {
+		Process process = new JavaExecutable().processBuilder("-jar", "spring-boot-smoke-test-ant.jar").directory(libs)
-
+				.start();
-			@Override
-			public boolean accept(File file) {
-				return file.getName().endsWith(".jar");
-			}
-
-		});
-		assertThat(jarFiles).hasSize(1);
-		Process process = new JavaExecutable().processBuilder("-jar", jarFiles[0].getName()).directory(target).start();
 		process.waitFor(5, TimeUnit.MINUTES);
 		assertThat(process.exitValue()).isEqualTo(0);
 		String output = FileCopyUtils.copyToString(new InputStreamReader(process.getInputStream()));