From aacdf051ce0a4f054efc2cdfaa01036f40248923 Mon Sep 17 00:00:00 2001
From: Tomas Hofman <thofman@redhat.com>
Date: Tue, 29 Jul 2025 09:51:10 +0200
Subject: [PATCH] Change the ant download URL for the old authentication,
 security and faces TCKs

---
 authentication/run-tck.sh | 11 ++++++-----
 faces/bin/run-tck.sh      | 11 ++++++-----
 security/run-tck.sh       | 11 ++++++-----
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/authentication/run-tck.sh b/authentication/run-tck.sh
index bb3d4e9..347606c 100755
--- a/authentication/run-tck.sh
+++ b/authentication/run-tck.sh
@@ -153,12 +153,13 @@ OLD_TCK_HOME=authentication-tck
 if [[ -n $TCK_PORTING_KIT ]] 
 then
     echo "Hold on tight!"
-    
+
+    ANT_VERSION="1.9.16"
+    ANT_URL="https://dlcdn.apache.org//ant/binaries/apache-ant-${ANT_VERSION}-bin.zip"
     if [[ ! "$ANT_HOME" ]];
     then
-        ANT_URL=https://dlcdn.apache.org//ant/binaries/apache-ant-1.9.16-bin.zip
-        ANT_ZIP=apache-ant-1.9.16-bin.zip
-        ANT_HOME=apache-ant-1.9.16
+        ANT_ZIP="apache-ant-${ANT_VERSION}-bin.zip"
+        ANT_HOME="apache-ant-${ANT_VERSION}"
         echo "Installing Ant."
         curl $ANT_URL -o $ANT_ZIP
         unzip ${UNZIP_ARGS} $ANT_ZIP
@@ -200,7 +201,7 @@ then
     then
         echo "Preparing Old TCK."
         pushd $TCK_ROOT/old-tck/build
-        mvn ${MVN_ARGS} install
+        mvn ${MVN_ARGS} install "-Dant.zip.url=${ANT_URL}" "-Dant.version=${ANT_VERSION}"
         popd
         unzip ${UNZIP_ARGS} $TCK_ROOT/old-tck/source/release/JASPIC_BUILD/latest/authentication-tck.zip
         echo "Fix the build.xml in the old TCK."
diff --git a/faces/bin/run-tck.sh b/faces/bin/run-tck.sh
index 6a3d4ea..addc533 100755
--- a/faces/bin/run-tck.sh
+++ b/faces/bin/run-tck.sh
@@ -237,12 +237,13 @@ pushd "${WORK_DIR}"
 if [[ -n $TCK_PORTING_KIT ]] 
 then
     echo "Hold on tight!"
-    
-    ANT_URL=https://dlcdn.apache.org//ant/binaries/apache-ant-1.9.16-bin.zip
+
+    ANT_VERSION="1.9.16"
+    ANT_URL="https://dlcdn.apache.org//ant/binaries/apache-ant-${ANT_VERSION}-bin.zip"
     ANT_CONTRIB_URL=https://sourceforge.net/projects/ant-contrib/files/ant-contrib/1.0b3/ant-contrib-1.0b3-bin.zip/download
-    ANT_ZIP=apache-ant-1.9.16-bin.zip
+    ANT_ZIP="apache-ant-${ANT_VERSION}-bin.zip"
     ANT_CONTRIB_ZIP=ant-contrib-1.0b3-bin.zip
-    export ANT_HOME="${WORK_DIR}"/apache-ant-1.9.16
+    export ANT_HOME="${WORK_DIR}/apache-ant-${ANT_VERSION}"
     export PATH=$ANT_HOME/bin:$PATH
     if ! test -d $ANT_HOME
     then
@@ -294,7 +295,7 @@ then
     then
         echo "Preparing Old TCK."
         pushd $TCK_ROOT/old-tck/build
-        mvn ${MVN_ARGS} install -Dtck.mode=platform
+        mvn ${MVN_ARGS} install -Dtck.mode=platform "-Dant.zip.url=${ANT_URL}" "-Dant.version=${ANT_VERSION}"
         popd
         
         pushd $TCK_ROOT/old-tck/source/release/JSF_BUILD/latest/
diff --git a/security/run-tck.sh b/security/run-tck.sh
index f1e7648..eb184b7 100755
--- a/security/run-tck.sh
+++ b/security/run-tck.sh
@@ -177,10 +177,11 @@ OLD_TCK_HOME=security-tck
 if [[ -n $TCK_PORTING_KIT ]] 
 then
     echo "Hold on tight!"
-    
-    ANT_URL=https://dlcdn.apache.org//ant/binaries/apache-ant-1.9.16-bin.zip
-    ANT_ZIP=apache-ant-1.9.16-bin.zip
-    ANT_HOME=apache-ant-1.9.16
+
+    ANT_VERSION="1.9.16"
+    ANT_URL="https://dlcdn.apache.org//ant/binaries/apache-ant-${ANT_VERSION}bin.zip"
+    ANT_ZIP="apache-ant-${ANT_VERSION}-bin.zip"
+    ANT_HOME="apache-ant-${ANT_VERSION}"
     if ! test -d $ANT_HOME
     then
         echo "Installing Ant."
@@ -226,7 +227,7 @@ then
     then
         echo "Preparing Old TCK."
         pushd $TCK_ROOT/old-tck/build
-        mvn ${MVN_ARGS} install -Ddownload.plugin.skip=true
+        mvn ${MVN_ARGS} install "-Dant.zip.url=${ANT_URL}" "-Dant.version=${ANT_VERSION}"
         popd
         unzip ${UNZIP_ARGS} $TCK_ROOT/old-tck/source/release/SECURITYAPI_BUILD/latest/security-tck.zip
         pushd $JEETCK_MODS