diff --git a/junit5-jupiter-starter-ant/.gitignore b/junit5-jupiter-starter-ant/.gitignore index ccfc2a1f..ab768aee 100644 --- a/junit5-jupiter-starter-ant/.gitignore +++ b/junit5-jupiter-starter-ant/.gitignore @@ -1,6 +1,7 @@ # Ant apache-ant-* build +lib # Ignore Gradle GUI config gradle-app.setting diff --git a/junit5-jupiter-starter-ant/build.sh b/junit5-jupiter-starter-ant/build.sh index f412e079..df6f5f7f 100755 --- a/junit5-jupiter-starter-ant/build.sh +++ b/junit5-jupiter-starter-ant/build.sh @@ -3,7 +3,7 @@ # # Set constants. # -junit_platform_version='1.5.2' +ivy_version='2.4.0' ant_version='1.10.7' ant_folder="apache-ant-${ant_version}" ant_archive="${ant_folder}-bin.tar.gz" @@ -15,9 +15,9 @@ curl --remote-name "https://archive.apache.org/dist/ant/binaries/${ant_archive}" tar --extract -z --exclude "${ant_folder}/manual" --file "${ant_archive}" # -# Load and store junit-platform-console-standalone jar into ${ANT_HOME}/lib. +# Load and store ivy jar into ${ANT_HOME}/lib. # -(cd "${ant_folder}/lib" && curl --remote-name "http://central.maven.org/maven2/org/junit/platform/junit-platform-console-standalone/${junit_platform_version}/junit-platform-console-standalone-${junit_platform_version}.jar") +(cd "${ant_folder}/lib" && curl --remote-name "http://central.maven.org/maven2/org/apache/ivy/ivy/${ivy_version}/ivy-${ivy_version}.jar") # # Finally, let Ant do its work... diff --git a/junit5-jupiter-starter-ant/build.xml b/junit5-jupiter-starter-ant/build.xml index 5f2512e8..8bcbcc0a 100644 --- a/junit5-jupiter-starter-ant/build.xml +++ b/junit5-jupiter-starter-ant/build.xml @@ -1,5 +1,5 @@ - + @@ -12,7 +12,7 @@ - + @@ -27,13 +27,17 @@ - + + + + + - + @@ -46,20 +50,4 @@ - - - - - - - - - - - - - - - - diff --git a/junit5-jupiter-starter-ant/ivy.xml b/junit5-jupiter-starter-ant/ivy.xml new file mode 100644 index 00000000..c1120a4e --- /dev/null +++ b/junit5-jupiter-starter-ant/ivy.xml @@ -0,0 +1,8 @@ + + + + + + + +