[ant] branch master updated: IBM's ftp now requires ftps which is not supported by java.net.URL

[bo...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

bodewig pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ant.git


The following commit(s) were added to refs/heads/master by this push:
     new 541a1d244 IBM's ftp now requires ftps which is not supported by java.net.URL
541a1d244 is described below

commit 541a1d2448af3e95134f79a970a608403deab00a
Author: Stefan Bodewig <bo...@apache.org>
AuthorDate: Sat Mar 4 15:22:53 2023 +0100

    IBM's ftp now requires ftps which is not supported by java.net.URL
---
 fetch.xml                | 28 +++-------------------------
 lib/libraries.properties |  3 ++-
 2 files changed, 5 insertions(+), 26 deletions(-)

diff --git a/fetch.xml b/fetch.xml
index 038ee120e..07292d389 100644
--- a/fetch.xml
+++ b/fetch.xml
@@ -375,34 +375,12 @@ Set -Ddest=LOCATION on the command line
 
   <target name="netrexx"
           description="load NetRexx compiler"
-          depends="init-no-m2,-setup-temp-cache,-fetch-netrexx,-fetch-netrexx-no-commons-net">
-    <checksum file="${temp.dir}/NetRexx.zip" algorithm="SHA-256" property="${netrexx.sha256}" verifyProperty="netrexx.hash.matches"/>
-    <fail message="NetRexx.zip fetched via ftp has an unexpected SHA-256 checksum, the file may have been tampered with">
-       <condition>
-         <not>
-           <istrue value="${netrexx.hash.matches}"/>
-         </not>
-      </condition>
-    </fail>
-    <copy todir="${dest.dir}" flatten="true">
-      <zipfileset src="${temp.dir}/NetRexx.zip">
-        <include name="NetRexx\lib\NetRexxC.jar"/>
-        <include name="NetRexx\browse\license.txt"/>
-      </zipfileset>
-    </copy>
-    <antcall target="-cleanup-temp-cache"/>
+          depends="init-no-m2,-setup-temp-cache,-fetch-netrexx">
+    <get src="https://netrexx.org/files/NetRexxC-${netrexx.version}.jar"
+         dest="${dest.dir}" skipexisting="true"/>
   </target>
 
-  <available property="have.commons.net" classname="org.apache.commons.net.ftp.FTPClientConfig"/>
-
   <target name="-fetch-netrexx" if="have.commons.net">
-    <get-ftp-file host="ftp.software.ibm.com" remotedir="/software/awdtools/netrexx"
-            filename="NetRexx.zip" localdir="${temp.dir}"/>
-  </target>
-
-  <target name="-fetch-netrexx-no-commons-net" unless="have.commons.net">
-    <get src="ftp://ftp.software.ibm.com/software/awdtools/netrexx/NetRexx.zip"
-         dest="${temp.dir}/NetRexx.zip" skipexisting="true"/>
   </target>
 
   <target name="xz"
diff --git a/lib/libraries.properties b/lib/libraries.properties
index 91b9b859f..418de4282 100644
--- a/lib/libraries.properties
+++ b/lib/libraries.properties
@@ -29,7 +29,7 @@ m2.sha1.checksum=c4642858aa22465650ad2a469b24e22696177441
 m2.repo=https://repo1.maven.org/maven2/
 
 # hashes of libraries loaded over insecure connections
-netrexx.sha256=1f99f054e9b1e412d29823088f3fa7cfce90a7af25d907a60a6d7908a6b97ea4
+.sha256=2443dfe8d8974a38a390ee55c2757396f3e2350d4b18cc8dc489709bf5593b61
 
 # Versions of different libraries. Please keep in alphabetical order, except
 # when a specific dependency forces them to be out-of-order
@@ -51,6 +51,7 @@ hamcrest-core.version=1.3
 hamcrest-library.version=${hamcrest-core.version}
 jai-core.version=1.1.3
 jai-codec.version=1.1.3
+netrexx.version=2.05
 # Later 1.6 versions call themselves "jakarta.mail" but do not use the namespace yet
 javax.mail.version=1.6.2
 jakarta.mail.version=2.0.1