Skip to content

Commit 673d301

Browse files
committed
Make Ant smoke test more robust
Closes gh-33295
1 parent b960609 commit 673d301

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,11 @@
1414
<property name="lib.dir" location="${basedir}/build/ant/lib" />
1515
<property name="start-class" value="smoketest.ant.SampleAntApplication" />
1616

17-
<target name="resolve" description="--> retrieve dependencies with ivy">
17+
<target name="clean-ivy-cache">
18+
<ivy:cleancache />
19+
</target>
20+
21+
<target name="resolve" depends="clean-ivy-cache" description="--> retrieve dependencies with ivy">
1822
<ivy:retrieve pattern="${lib.dir}/[conf]/[artifact]-[type]-[revision].[ext]" />
1923
</target>
2024

@@ -37,6 +41,7 @@
3741
</target>
3842

3943
<target name="build" depends="compile">
44+
<delete file="build/ant/libs/${ant.project.name}.jar"/>
4045
<spring-boot:exejar destfile="build/ant/libs/${ant.project.name}.jar" classes="build/ant/classes">
4146
<spring-boot:lib>
4247
<fileset dir="${lib.dir}/runtime" />

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<ivysettings>
22
<settings defaultResolver="chain" />
3+
<caches defaultCacheDir="${projectDir}/build/ivy-cache"/>
34
<resolvers>
45
<chain name="chain" returnFirst="true">
56
<!-- NOTE: You should declare only repositories that you need here -->

0 commit comments

Comments
 (0)