Second attempt to fix spring-boot-smoke-test-ant

philwebb · philwebb · commit e5b03a774187 · 2024-10-01T16:56:37.000-07:00
Fix error introduced in commit d44e7c9 See gh-42333
diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-ant/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-ant/build.gradle
@@ -54,6 +54,7 @@ task copyAntSources(type: Copy) {
 }
 
 task antRun(type: JavaExec) {
+	workingDir "${buildDir}/ant"
 	dependsOn syncTestRepository, copyAntSources, configurations.antDependencies
 	classpath = configurations.antDependencies;
 	mainClass = "org.apache.tools.ant.launch.Launcher"
diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-ant/build.xml b/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}/build/ant/lib" />
+	<property name="lib.dir" location="${basedir}/lib" />
 	<property name="start-class" value="smoketest.ant.SampleAntApplication" />
 
 	<target name="clean-ivy-cache">

Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,7 @@ task copyAntSources(type: Copy) {`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`task antRun(type: JavaExec) {`
	`57`	`+ workingDir "${buildDir}/ant"`
`57`	`58`	`dependsOn syncTestRepository, copyAntSources, configurations.antDependencies`
`58`	`59`	`classpath = configurations.antDependencies;`
`59`	`60`	`mainClass = "org.apache.tools.ant.launch.Launcher"`