From fb685f486d7d021513508b07907c6491c3196d49 Mon Sep 17 00:00:00 2001
From: s-tanaka <seito.tanaka.dev@gmail.com>
Date: Wed, 2 Oct 2019 22:02:37 +0900
Subject: [PATCH 1/4] Remove ConsoleLauncher configuration (#98)

---
 junit5-jupiter-starter-ant/build.sh  | 12 ++++++++++--
 junit5-jupiter-starter-ant/build.xml | 18 +-----------------
 2 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/junit5-jupiter-starter-ant/build.sh b/junit5-jupiter-starter-ant/build.sh
index f412e079..0088a2fa 100755
--- a/junit5-jupiter-starter-ant/build.sh
+++ b/junit5-jupiter-starter-ant/build.sh
@@ -4,6 +4,7 @@
 # Set constants.
 #
 junit_platform_version='1.5.2'
+junit_jupiter_version='5.5.2'
 ant_version='1.10.7'
 ant_folder="apache-ant-${ant_version}"
 ant_archive="${ant_folder}-bin.tar.gz"
@@ -15,9 +16,16 @@ 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 necessary JUnit5 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/junit/platform/junit-platform-commons/${junit_platform_version}/junit-platform-commons-${junit_platform_version}.jar")
+(cd "${ant_folder}/lib" && curl --remote-name "http://central.maven.org/maven2/org/junit/platform/junit-platform-engine/${junit_platform_version}/junit-platform-engine-${junit_platform_version}.jar")
+(cd "${ant_folder}/lib" && curl --remote-name "http://central.maven.org/maven2/org/junit/platform/junit-platform-launcher/${junit_platform_version}/junit-platform-launcher-${junit_platform_version}.jar")
+(cd "${ant_folder}/lib" && curl --remote-name "http://central.maven.org/maven2/org/junit/jupiter/junit-jupiter-api/${junit_jupiter_version}/junit-jupiter-api-${junit_jupiter_version}.jar")
+(cd "${ant_folder}/lib" && curl --remote-name "http://central.maven.org/maven2/org/junit/jupiter/junit-jupiter-engine/${junit_jupiter_version}/junit-jupiter-engine-${junit_jupiter_version}.jar")
+(cd "${ant_folder}/lib" && curl --remote-name "http://central.maven.org/maven2/org/junit/jupiter/junit-jupiter-params/${junit_jupiter_version}/junit-jupiter-params-${junit_jupiter_version}.jar")
+(cd "${ant_folder}/lib" && curl --remote-name "http://central.maven.org/maven2/org/opentest4j/opentest4j/1.2.0/opentest4j-1.2.0.jar")
+(cd "${ant_folder}/lib" && curl --remote-name "http://central.maven.org/maven2/org/apiguardian/apiguardian-api/1.1.0/apiguardian-api-1.1.0.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..30a4993f 100644
--- a/junit5-jupiter-starter-ant/build.xml
+++ b/junit5-jupiter-starter-ant/build.xml
@@ -33,7 +33,7 @@
     </target>
 
     <!-- https://junit.org/junit5/docs/snapshot/user-guide/#running-tests-build-ant -->
-    <target name="test.junit.launcher" depends="compile">
+    <target name="test" depends="compile">
         <junitlauncher haltOnFailure="true" printSummary="true">
             <classpath refid="test.classpath"/>
             <testclasses outputdir="build/test-report">
@@ -46,20 +46,4 @@
         </junitlauncher>
     </target>
 
-    <!-- https://junit.org/junit5/docs/current/user-guide/#running-tests-console-launcher -->
-    <target name="test.console.launcher" depends="compile">
-        <java classpathref="test.classpath" classname="org.junit.platform.console.ConsoleLauncher" fork="true" failonerror="true">
-            <arg value="--scan-classpath"/>
-            <arg line="--reports-dir build/test-report"/>
-        </java>
-        <junitreport todir="build/test-report">
-            <fileset dir="build/test-report">
-                <include name="TEST-*.xml"/>
-            </fileset>
-            <report format="frames" todir="build/test-report/html"/>
-        </junitreport>
-    </target>
-
-    <target name="test" depends="test.junit.launcher, test.console.launcher" />
-
 </project>

From 2c3a8576ac6ef86eb7e1c1a905be788ada8cb730 Mon Sep 17 00:00:00 2001
From: s-tanaka <seito.tanaka.dev@gmail.com>
Date: Thu, 3 Oct 2019 23:29:02 +0900
Subject: [PATCH 2/4] Use Apache Ivy in Ant examples (#115)

---
 junit5-jupiter-starter-ant/.gitignore |  1 +
 junit5-jupiter-starter-ant/build.sh   | 14 +++-----------
 junit5-jupiter-starter-ant/build.xml  | 10 +++++++---
 junit5-jupiter-starter-ant/ivy.xml    |  8 ++++++++
 4 files changed, 19 insertions(+), 14 deletions(-)
 create mode 100644 junit5-jupiter-starter-ant/ivy.xml

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 0088a2fa..2a026595 100755
--- a/junit5-jupiter-starter-ant/build.sh
+++ b/junit5-jupiter-starter-ant/build.sh
@@ -3,8 +3,7 @@
 #
 # Set constants.
 #
-junit_platform_version='1.5.2'
-junit_jupiter_version='5.5.2'
+ivy_version='2.5.0-rc1'
 ant_version='1.10.7'
 ant_folder="apache-ant-${ant_version}"
 ant_archive="${ant_folder}-bin.tar.gz"
@@ -16,16 +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 necessary JUnit5 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-commons/${junit_platform_version}/junit-platform-commons-${junit_platform_version}.jar")
-(cd "${ant_folder}/lib" && curl --remote-name "http://central.maven.org/maven2/org/junit/platform/junit-platform-engine/${junit_platform_version}/junit-platform-engine-${junit_platform_version}.jar")
-(cd "${ant_folder}/lib" && curl --remote-name "http://central.maven.org/maven2/org/junit/platform/junit-platform-launcher/${junit_platform_version}/junit-platform-launcher-${junit_platform_version}.jar")
-(cd "${ant_folder}/lib" && curl --remote-name "http://central.maven.org/maven2/org/junit/jupiter/junit-jupiter-api/${junit_jupiter_version}/junit-jupiter-api-${junit_jupiter_version}.jar")
-(cd "${ant_folder}/lib" && curl --remote-name "http://central.maven.org/maven2/org/junit/jupiter/junit-jupiter-engine/${junit_jupiter_version}/junit-jupiter-engine-${junit_jupiter_version}.jar")
-(cd "${ant_folder}/lib" && curl --remote-name "http://central.maven.org/maven2/org/junit/jupiter/junit-jupiter-params/${junit_jupiter_version}/junit-jupiter-params-${junit_jupiter_version}.jar")
-(cd "${ant_folder}/lib" && curl --remote-name "http://central.maven.org/maven2/org/opentest4j/opentest4j/1.2.0/opentest4j-1.2.0.jar")
-(cd "${ant_folder}/lib" && curl --remote-name "http://central.maven.org/maven2/org/apiguardian/apiguardian-api/1.1.0/apiguardian-api-1.1.0.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 30a4993f..8bcbcc0a 100644
--- a/junit5-jupiter-starter-ant/build.xml
+++ b/junit5-jupiter-starter-ant/build.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="junit5-jupiter-starter-ant" default="build" basedir=".">
+<project xmlns:ivy="antlib:org.apache.ivy.ant" name="junit5-jupiter-starter-ant" default="build" basedir=".">
 
     <fail message="Ant 1.10.4+ is required!">
         <condition>
@@ -12,7 +12,7 @@
     <path id="test.classpath">
         <pathelement path="build/test"/>
         <pathelement path="build/main"/>
-        <fileset dir="${ant.home}/lib" includes="*.jar" />
+        <fileset dir="lib" includes="*.jar" />
     </path>
 
     <target name="build" description="clean build" depends="clean, test" />
@@ -27,7 +27,11 @@
         <mkdir dir="build/test-report"/>
     </target>
 
-    <target name="compile" depends="init">
+    <target name="ivy-retrieve">
+        <ivy:retrieve/>
+    </target>
+
+    <target name="compile" depends="init, ivy-retrieve">
         <javac destdir="build/main" srcdir="src/main/java" includeantruntime="false"/>
         <javac destdir="build/test" classpathref="test.classpath" srcdir="src/test/java" includeantruntime="false"/>
     </target>
diff --git a/junit5-jupiter-starter-ant/ivy.xml b/junit5-jupiter-starter-ant/ivy.xml
new file mode 100644
index 00000000..b3a19165
--- /dev/null
+++ b/junit5-jupiter-starter-ant/ivy.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ivy-module version="2.0">
+  <info organisation="com.example" module="junit5-jupiter-starter-ant"/>
+  <dependencies>
+    <dependency org="org.junit.platform" name="junit-platform-launcher" rev="1.5.2"/>
+    <dependency org="org.junit.jupiter" name="junit-jupiter" rev="5.5.2"/>
+  </dependencies>
+</ivy-module>

From 5bf2c09f6463e3a18b7a145bc3fb02680f8c85a5 Mon Sep 17 00:00:00 2001
From: s-tanaka <seito.tanaka.dev@gmail.com>
Date: Thu, 3 Oct 2019 23:37:21 +0900
Subject: [PATCH 3/4] Fix indent

---
 junit5-jupiter-starter-ant/ivy.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/junit5-jupiter-starter-ant/ivy.xml b/junit5-jupiter-starter-ant/ivy.xml
index b3a19165..c1120a4e 100644
--- a/junit5-jupiter-starter-ant/ivy.xml
+++ b/junit5-jupiter-starter-ant/ivy.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ivy-module version="2.0">
-  <info organisation="com.example" module="junit5-jupiter-starter-ant"/>
-  <dependencies>
-    <dependency org="org.junit.platform" name="junit-platform-launcher" rev="1.5.2"/>
-    <dependency org="org.junit.jupiter" name="junit-jupiter" rev="5.5.2"/>
-  </dependencies>
+    <info organisation="com.example" module="junit5-jupiter-starter-ant"/>
+    <dependencies>
+        <dependency org="org.junit.platform" name="junit-platform-launcher" rev="1.5.2"/>
+        <dependency org="org.junit.jupiter" name="junit-jupiter" rev="5.5.2"/>
+    </dependencies>
 </ivy-module>

From a71419b7f5a6e3b2815a267858b52e6f9184b2ed Mon Sep 17 00:00:00 2001
From: s-tanaka <seito.tanaka.dev@gmail.com>
Date: Sat, 5 Oct 2019 15:15:57 +0900
Subject: [PATCH 4/4] Use a stable version of Ivy

---
 junit5-jupiter-starter-ant/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/junit5-jupiter-starter-ant/build.sh b/junit5-jupiter-starter-ant/build.sh
index 2a026595..df6f5f7f 100755
--- a/junit5-jupiter-starter-ant/build.sh
+++ b/junit5-jupiter-starter-ant/build.sh
@@ -3,7 +3,7 @@
 #
 # Set constants.
 #
-ivy_version='2.5.0-rc1'
+ivy_version='2.4.0'
 ant_version='1.10.7'
 ant_folder="apache-ant-${ant_version}"
 ant_archive="${ant_folder}-bin.tar.gz"