diff -rauN apache-ant-1.9.15/fetch.xml apache-ant-1.9.15-https-and-repo-urls-patch/fetch.xml --- apache-ant-1.9.15/fetch.xml 2020-05-10 15:42:29.000000000 +0200 +++ apache-ant-1.9.15-https-and-repo-urls-patch/fetch.xml 2021-05-14 20:17:38.020978197 +0200 @@ -329,19 +329,19 @@ <f2 project="tomcat" archive="jasper-runtime"/> <f2 project="javax.servlet" archive="servlet-api"/> </target> - +<!-- <target name="jai" description="load Java Advanced Imaging" depends="init"> <f2 project="javax.media" archive="jai-core" id="jboss" - repository="https://repository.jboss.org/nexus/content/groups/public/"/> + repository="http://mvnrepository.com/"/> <f2 project="com.sun.media" archive="jai-codec" id="jboss" - repository="https://repository.jboss.org/nexus/content/groups/public/"/> + repository="http://repository.jboss.org/nexus/content/groups/public/"/> </target> - +--> <target name="netrexx" description="load NetRexx compiler" - depends="init-no-m2,-setup-temp-cache,-fetch-netrexx,-fetch-netrexx-no-commons-net"> + depends="init-no-m2,-setup-temp-cache"> <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> @@ -361,18 +361,22 @@ <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="all" description="load all the libraries (except jython)" - depends="antunit,ivy,logging,junit,xml,networking,regexp,antlr,bcel,jdepend,bsf,debugging,script,javamail,jspc,jai,netrexx"/> + depends="antunit,ivy,logging,junit,xml,networking,regexp,antlr,bcel,jdepend,bsf,debugging,script,javamail,jspc,netrexx"/> </project> diff -rauN apache-ant-1.9.15/lib/libraries.properties apache-ant-1.9.15-https-and-repo-urls-patch/lib/libraries.properties --- apache-ant-1.9.15/lib/libraries.properties 2020-05-10 15:42:29.000000000 +0200 +++ apache-ant-1.9.15-https-and-repo-urls-patch/lib/libraries.properties 2021-05-14 20:06:47.150502384 +0200 @@ -17,7 +17,7 @@ # If you change this, change the checksum to match m2.version=2.1.3 -m2.url=https://archive.apache.org/dist/maven/ant-tasks +m2.url=http://archive.apache.org/dist/maven/ant-tasks m2.artifact-name=maven-ant-tasks m2.jar.name=${m2.artifact-name}-${m2.version}.jar #this is the URL of the antlib library, that is pulled down for everything else. @@ -26,7 +26,7 @@ m2.sha1.checksum=b09be554228d66d208e5fef5266844aacf443abc # Repository to use by default for fetching dependencies. -m2.repo=https://repo1.maven.org/maven2/ +m2.repo=http://insecure.repo1.maven.org/maven2/ # hashes of libraries loaded over insecure connections netrexx.sha256=1f99f054e9b1e412d29823088f3fa7cfce90a7af25d907a60a6d7908a6b97ea4