CONTRIBUTORS

@@ -281,6 +281,7 @@ Matthew Warman
 Matthew Watson
 Matthew Yanos
 Matthias Bhend
+Matthias Gutheil
 Michael Bayne
 Michael Clarke
 Michael Davey
@@ -290,6 +291,7 @@ Michael Montuori
 Michael Newcomb
 Michael Nygard
 Michael Saunders
+Michael Seele
 Miha
 Mike Davis
 Mike Roberts

INSTALL

 For installation instructions see the manual by opening manual/index.html
-or see it online at <http://ant.apache.org/manual/index.html>.
+or see it online at <https://ant.apache.org/manual/index.html>.

LICENSE

@@ -193,7 +193,7 @@
  *   you may not use this file except in compliance with the License.
  *   You may obtain a copy of the License at
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
+ *       https://www.apache.org/licenses/LICENSE-2.0
  *
  *   Unless required by applicable law or agreed to in writing, software
  *   distributed under the License is distributed on an "AS IS" BASIS,
@@ -203,7 +203,7 @@
  */
 
 W3C® SOFTWARE NOTICE AND LICENSE
-http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+https://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
 
 This work (and included software, documentation such as READMEs, or other
 related items) is being provided by the copyright holders under the following

NOTICE

@@ -2,7 +2,7 @@ Apache Ant
 Copyright 1999-2019 The Apache Software Foundation
 
 This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
+The Apache Software Foundation (https://www.apache.org/).
 
 The <sync> task is based on code Copyright (c) 2002, Landmark
 Graphics Corp that has been kindly donated to the Apache Software

README

@@ -46,7 +46,7 @@
   ------------------
 
   Details of the latest version can be found on the Apache Ant
-  Project web site <http://ant.apache.org/>.
+  Project web site <https://ant.apache.org/>.
 
 
   Documentation
@@ -72,7 +72,7 @@
   encryption software.  BEFORE using any encryption software, please 
   check your country's laws, regulations and policies concerning the
   import, possession, or use, and re-export of encryption software, to 
-  see if this is permitted.  See <http://www.wassenaar.org/> for more
+  see if this is permitted.  See <https://www.wassenaar.org/> for more
   information.
 
   The U.S. Government Department of Commerce, Bureau of Industry and
@@ -91,10 +91,10 @@
   For the SSH family of tasks (<sshexec> and <scp>) Ant requires the
   JSch <http://www.jcraft.com/jsch/index.html> library as well as the
   Java Cryptography extensions
-  <http://java.sun.com/javase/technologies/security/>.  Ant does not
+  <https://www.oracle.com/technetwork/java/javase/tech/index-jsp-136007.html>.  Ant does not
   include these libraries itself, but is designed to use them.
 
   Thanks for using Ant.
 
                                           The Apache Ant Project
-                                         <http://ant.apache.org/>
+                                         <https://ant.apache.org/>

WHATSNEW

+Changes from Ant 1.10.6 TO Ant 1.10.7
+=====================================
+
+Fixed bugs:
+-----------
+
+ * FTP still tries checking or entering directories after a timeout
+   Bugzilla Report 63454
+
+ * junitlauncher - does not detect failure in @BeforeAll
+   Bugzilla Report 63479
+
+ * Error using ant-1.10.6 with jdk8
+   Bugzilla Report 63457
+
+ * FTP task no longer duplicates a check for a file being a symlink.
+   Bugzilla Report 63259
+
+ * junitlauncher task, when used in fork mode with "<testclasses>",
+   used to create the wrong number of listeners per test class. This
+   has now been fixed.
+   Bugzilla Report 63446
+
+ * The "legacy-xml" junitlauncher task's listener would not include
+   @ParameterizedTest testcases in its XML report file. This has now
+   been fixed.
+   Bugzilla Report 63680
+
+Other changes:
+--------------
+
+ * FTP task timeout improvements.
+   Bugzilla Reports 63252 and 47414
+
+ * junitlauncher task now supports selecting test classes for execution,
+   based on the JUnit 5 tags, through the new "includeTags" and
+   "excludeTags" attributes.
+
+ * prefer https over http when building ant itself, and in the ant 
+   documentation and sources
+
+ * changed the references and Maven coordinates of JavaMail dependency
+   to Jakarta Mail and thus javax.mail to jakarta.mail - and upgraded
+   the dependency to 1.6.3.
+
 Changes from Ant 1.10.5 TO Ant 1.10.6
 =====================================
 

bootstrap.bat

@@ -10,7 +10,7 @@ REM  The ASF licenses this file to You under the Apache License, Version 2.0
 REM  (the "License"); you may not use this file except in compliance with
 REM  the License.  You may obtain a copy of the License at
 REM
-REM      http://www.apache.org/licenses/LICENSE-2.0
+REM      https://www.apache.org/licenses/LICENSE-2.0
 REM
 REM  Unless required by applicable law or agreed to in writing, software
 REM  distributed under the License is distributed on an "AS IS" BASIS,
@@ -61,10 +61,20 @@ if not "%OS%" == "Windows_NT" if exist %CLASSDIR%\nul deltree/y %CLASSDIR%
 if not exist build\nul mkdir build
 if not exist build\classes\nul mkdir build\classes
 
+rem Check if javac tool supports the --release param
+SET JAVAC_RELEASE_VERSION=""
+echo "public class JavacVersionCheck {}" > %CLASSDIR%\JavacVersionCheck.java
+"%JAVAC%" --release 8 -d %CLASSDIR% %CLASSDIR%\JavacVersionCheck.java >nul 2>&1
+IF %ERRORLEVEL% EQU 0 SET JAVAC_RELEASE_VERSION="--release 8"
+DEL %CLASSDIR%\JavacVersionCheck.java %CLASSDIR%\JavacVersionCheck.class >nul 2>&1
 echo.
+IF %JAVAC_RELEASE_VERSION% == "" (
   echo ... Compiling Ant Classes
-
   "%JAVAC%" %BOOTJAVAC_OPTS% -d %CLASSDIR% %TOOLS%\bzip2\*.java %TOOLS%\tar\*.java %TOOLS%\zip\*.java %TOOLS%\ant\*.java %TOOLS%\ant\types\*.java %TOOLS%\ant\taskdefs\*.java %TOOLS%\ant\util\regexp\RegexpMatcher.java %TOOLS%\ant\util\regexp\RegexpMatcherFactory.java %TOOLS%\ant\taskdefs\condition\*.java %TOOLS%\ant\taskdefs\compilers\*.java %TOOLS%\ant\types\resources\*.java %TOOLS%\ant\property\*.java
+) ELSE (
+  echo ... Compiling Ant Classes with %JAVAC_RELEASE_VERSION%
+  "%JAVAC%" %BOOTJAVAC_OPTS% -d %CLASSDIR% %JAVAC_RELEASE_VERSION% %TOOLS%\bzip2\*.java %TOOLS%\tar\*.java %TOOLS%\zip\*.java %TOOLS%\ant\*.java %TOOLS%\ant\types\*.java %TOOLS%\ant\taskdefs\*.java %TOOLS%\ant\util\regexp\RegexpMatcher.java %TOOLS%\ant\util\regexp\RegexpMatcherFactory.java %TOOLS%\ant\taskdefs\condition\*.java %TOOLS%\ant\taskdefs\compilers\*.java %TOOLS%\ant\types\resources\*.java %TOOLS%\ant\property\*.java
+)
 
 if ERRORLEVEL 1 goto mainend
 

bootstrap.sh

@@ -7,7 +7,7 @@
 # (the "License"); you may not use this file except in compliance with
 # the License.  You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -127,9 +127,24 @@ mkdir -p build
 mkdir -p ${CLASSDIR}
 mkdir -p bin
 
+# Check if javac tool supports the --release param
+echo "public class JavacVersionCheck {}" > ${CLASSDIR}/JavacVersionCheck.java
+"${JAVAC}" --release 8 -d ${CLASSDIR} ${CLASSDIR}/JavacVersionCheck.java 1>&2 2>/dev/null
+ret=$?
+rm ${CLASSDIR}/JavacVersionCheck.java ${CLASSDIR}/JavacVersionCheck.class 1>&2 2>/dev/null
+JAVAC_RELEASE_VERSION=
+if [ $ret -eq 0 ]; then
+  # set --release to 8
+  JAVAC_RELEASE_VERSION="--release 8"
+fi
+if [ "${JAVAC_RELEASE_VERSION}" = "" ]; then
   echo ... Compiling Ant Classes
+else
+  echo ... Compiling Ant Classes with ${JAVAC_RELEASE_VERSION}
+fi
 
-"${JAVAC}" $BOOTJAVAC_OPTS -d ${CLASSDIR} ${TOOLS}/bzip2/*.java ${TOOLS}/tar/*.java ${TOOLS}/zip/*.java \
+"${JAVAC}" $BOOTJAVAC_OPTS -d ${CLASSDIR} ${JAVAC_RELEASE_VERSION} \
+           ${TOOLS}/bzip2/*.java ${TOOLS}/tar/*.java ${TOOLS}/zip/*.java \
            ${TOOLS}/ant/util/regexp/RegexpMatcher.java \
            ${TOOLS}/ant/util/regexp/RegexpMatcherFactory.java \
            ${TOOLS}/ant/property/*.java \

build.bat

@@ -7,7 +7,7 @@ REM  The ASF licenses this file to You under the Apache License, Version 2.0
 REM  (the "License"); you may not use this file except in compliance with
 REM  the License.  You may obtain a copy of the License at
 REM 
-REM      http://www.apache.org/licenses/LICENSE-2.0
+REM      https://www.apache.org/licenses/LICENSE-2.0
 REM 
 REM  Unless required by applicable law or agreed to in writing, software
 REM  distributed under the License is distributed on an "AS IS" BASIS,

build.sh

@@ -7,7 +7,7 @@
 # (the "License"); you may not use this file except in compliance with
 # the License.  You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,

build.xml

@@ -8,7 +8,7 @@
    (the "License"); you may not use this file except in compliance with
    the License.  You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
@@ -33,10 +33,10 @@
   <property name="name" value="ant"/>
   <!-- this is the directory corresponding to groupId of Ant in the Maven repository -->
   <property name="groupid" value="org/apache/ant"/>
-  <property name="project.version" value="1.10.6"/>
+  <property name="project.version" value="1.10.7"/>
   <!-- pom.version is used when doing a distribution and must match with what is checked in under src/etc/poms -->
-  <property name="pom.version" value="1.10.6"/>
-  <property name="manifest-version" value="1.10.6"/>
+  <property name="pom.version" value="1.10.7"/>
+  <property name="manifest-version" value="1.10.7"/>
   <property name="bootstrap.jar" value="ant-bootstrap.jar"/>
 
   <property name="ant.package" value="org/apache/tools/ant"/>
@@ -106,6 +106,7 @@
   <property name="optimize" value="true"/>
   <property name="javac.target" value="1.8"/>
   <property name="javac.source" value="1.8"/>
+  <property name="javac.release" value="8"/>
   <property name="junit.filtertrace" value="off"/>
   <property name="junit.summary" value="no"/>
   <property name="test.haltonfailure" value="false"/>
@@ -594,12 +595,67 @@
          Build the code
        ===================================================================
   -->
-  <target name="build" depends="prepare"
+  <target name="build" depends="prepare, compile, compile-jdk9+" unless="skip.build"
           description="--> compiles the source code">
-    <mkdir dir="${build.dir}"/>
-    <mkdir dir="${build.classes}"/>
-    <mkdir dir="${build.lib}"/>
 
+    <!-- Builds and verifies that the classes belonging in the confined package of
+    junitlauncher task do not depend on classes they aren't meant to -->
+    <!-- first wipe out the "confined" package that might have been built already
+     due to the javac above -->
+    <delete dir="${build.classes}/${optional.package}/junitlauncher/confined/"/>
+    <javac srcdir="${java.dir}"
+           includeantruntime="false"
+           destdir="${build.classes}"
+           debug="${debug}"
+           deprecation="${deprecation}"
+           includes="${optional.package}/junitlauncher/confined/**"
+           target="${javac.target}"
+           source="${javac.source}"
+           release="${javac.release}"
+           optimize="${optimize}">
+      <classpath>
+        <!-- A very limited classpath which only doesn't include optional libraries,
+         which the classes in confined package aren't meant to depend on -->
+        <fileset dir="${build.classes}">
+          <!-- exclude the org/apache/tools/ant/taskdefs/optional/junitlauncher package
+          from the classpath, since the confined package isn't meant to depend on
+          classes in this package -->
+          <exclude name="org/apache/tools/ant/taskdefs/optional/junitlauncher/*"/>
+        </fileset>
+      </classpath>
+
+    </javac>
+
+    <copy todir="${build.classes}">
+      <fileset dir="${java.dir}">
+        <include name="**/*.properties"/>
+        <include name="**/*.dtd"/>
+        <include name="**/*.xml"/>
+      </fileset>
+      <fileset dir="${resource.dir}"/>
+    </copy>
+
+    <copy todir="${build.classes}"
+      overwrite="true" encoding="UTF-8">
+      <fileset dir="${java.dir}">
+        <include name="**/version.txt"/>
+        <include name="**/defaultManifest.mf"/>
+      </fileset>
+      <filterchain refid="ant.filters"/>
+    </copy>
+
+    <copy todir="${build.classes}/${optional.package}/junit/xsl">
+      <fileset dir="${etc.dir}">
+        <include name="junit-frames.xsl"/>
+        <include name="junit-noframes.xsl"/>
+        <include name="junit-frames-saxon.xsl"/>
+        <include name="junit-noframes-saxon.xsl"/>
+      </fileset>
+    </copy>
+  </target>
+
+  <target name="compile" depends="prepare">
+    <mkdir dir="${build.classes}"/>
     <javac srcdir="${java.dir}"
            includeantruntime="false"
            destdir="${build.classes}"
@@ -608,13 +664,14 @@
            excludes="${optional.package}/junitlauncher/confined/**"
            target="${javac.target}"
            source="${javac.source}"
+           release="${javac.release}"
            optimize="${optimize}">
       <classpath refid="classpath"/>
 
       <selector id="conditional-patterns">
         <not>
           <or>
-            <selector refid="needs.jdk9+" unless="jdk9+"/>
+            <selector refid="needs.jdk9+"/>
             <selector refid="not.in.kaffe" if="kaffe"/>
             <selector refid="needs.apache-resolver" unless="apache.resolver.present"/>
             <selector refid="needs.junit" unless="junit.present"/> <!-- TODO should perhaps use -source 1.4? -->
@@ -645,60 +702,27 @@
         </not>
       </selector>
     </javac>
+  </target>
+
+  <target name="compile-jdk9+" depends="prepare" if="jdk9+">
+    <mkdir dir="${build.classes}"/>
 
-    <!-- Builds and verifies that the classes belonging in the confined package of
-    junitlauncher task do not depend on classes they aren't meant to -->
-    <!-- first wipe out the "confined" package that might have been built already
-     due to the javac above -->
-    <delete dir="${build.classes}/${optional.package}/junitlauncher/confined/"/>
     <javac srcdir="${java.dir}"
            includeantruntime="false"
            destdir="${build.classes}"
            debug="${debug}"
            deprecation="${deprecation}"
-           includes="${optional.package}/junitlauncher/confined/**"
            target="${javac.target}"
            source="${javac.source}"
            optimize="${optimize}">
-      <classpath>
-        <!-- A very limited classpath which only doesn't include optional libraries,
-         which the classes in confined package aren't meant to depend on -->
-        <fileset dir="${build.classes}">
-          <!-- exclude the org/apache/tools/ant/taskdefs/optional/junitlauncher package
-          from the classpath, since the confined package isn't meant to depend on
-          classes in this package -->
-          <exclude name="org/apache/tools/ant/taskdefs/optional/junitlauncher/*"/>
-        </fileset>
-      </classpath>
+      <classpath refid="classpath"/>
 
+      <selector id="conditional-patterns-jdk9+">
+          <or>
+            <selector refid="needs.jdk9+"/>
+          </or>
+      </selector>
     </javac>
-
-    <copy todir="${build.classes}">
-      <fileset dir="${java.dir}">
-        <include name="**/*.properties"/>
-        <include name="**/*.dtd"/>
-        <include name="**/*.xml"/>
-      </fileset>
-      <fileset dir="${resource.dir}"/>
-    </copy>
-
-    <copy todir="${build.classes}"
-      overwrite="true" encoding="UTF-8">
-      <fileset dir="${java.dir}">
-        <include name="**/version.txt"/>
-        <include name="**/defaultManifest.mf"/>
-      </fileset>
-      <filterchain refid="ant.filters"/>
-    </copy>
-
-    <copy todir="${build.classes}/${optional.package}/junit/xsl">
-      <fileset dir="${etc.dir}">
-        <include name="junit-frames.xsl"/>
-        <include name="junit-noframes.xsl"/>
-        <include name="junit-frames-saxon.xsl"/>
-        <include name="junit-noframes-saxon.xsl"/>
-      </fileset>
-    </copy>
   </target>
 
   <!--
@@ -1574,6 +1598,7 @@
            debug="${debug}"
            target="${javac.target}"
            source="${javac.source}"
+           release="${javac.release}"
            deprecation="${deprecation}">
       <classpath refid="tests-classpath"/>
 

contributors.xml

@@ -7,7 +7,7 @@
    (the "License"); you may not use this file except in compliance with
    the License.  You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
@@ -1167,6 +1167,10 @@
     <first>Matthias</first>
     <last>Bhend</last>
   </name>
+  <name>
+    <first>Matthias</first>
+    <last>Gutheil</last>
+  </name>
   <name>
     <first>Michael</first>
     <last>Bayne</last>
@@ -1204,6 +1208,10 @@
     <first>Michael</first>
     <last>Saunders</last>
   </name>
+  <name>
+    <first>Michael</first>
+    <last>Seele</last>
+  </name>
   <name>
     <last>Miha</last>
   </name>

debian/changelog

+ant (1.10.7-1) unstable; urgency=medium
+
+  * Team upload.
+  * New upstream release
+    - Refreshed the patches
+  * Standards-Version updated to 4.4.1
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Thu, 24 Oct 2019 15:50:29 +0200
+
 ant (1.10.6-1) unstable; urgency=medium
 
   * Team upload.

debian/control

@@ -25,7 +25,7 @@ Build-Depends: antlr,
                libxml-commons-resolver1.1-java (>= 1.2-7~),
                libxz-java,
                maven-repo-helper (>> 1.0)
-Standards-Version: 4.4.0
+Standards-Version: 4.4.1
 Vcs-Git: https://salsa.debian.org/java-team/ant.git
 Vcs-Browser: https://salsa.debian.org/java-team/ant
 Homepage: http://ant.apache.org

debian/patches/0010-reproducible-javadoc-task.patch

@@ -5,7 +5,7 @@ Author: Emmanuel Bourg <ebourg@apache.org>
 Forwarded: no
 --- a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
 +++ b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
-@@ -1811,6 +1811,16 @@
+@@ -1807,6 +1807,16 @@
       */
      @Override
      public void execute() throws BuildException {

debian/patches/0013-auto-adjust-target.patch

@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg@apache.org>
 Forwarded: no
 --- a/src/main/org/apache/tools/ant/taskdefs/Javac.java
 +++ b/src/main/org/apache/tools/ant/taskdefs/Javac.java
-@@ -214,7 +214,7 @@
+@@ -202,7 +202,7 @@
       */
      public String getSource() {
          return source != null
@@ -12,7 +12,7 @@ Forwarded: no
      }
  
      /**
-@@ -793,7 +793,7 @@
+@@ -781,7 +781,7 @@
      public String getTarget() {
          return targetAttribute != null
              ? targetAttribute
@@ -21,7 +21,7 @@ Forwarded: no
      }
  
      /**
-@@ -1121,7 +1121,7 @@
+@@ -1104,7 +1104,7 @@
      public void execute() throws BuildException {
          checkParameters();
          resetFileLists();
@@ -30,7 +30,7 @@ Forwarded: no
          // scan source directories and dest directory to build up
          // compile list
          if (hasPath(src)) {
-@@ -1714,4 +1714,11 @@
+@@ -1697,4 +1697,11 @@
          0x00, 0x00, 0x00, 0x02, 0x00, 0x04
      };
  
@@ -44,15 +44,15 @@ Forwarded: no
  }
 --- a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
 +++ b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
-@@ -2273,7 +2273,7 @@
-             : getProject().getProperty(MagicNames.BUILD_JAVAC_SOURCE);
+@@ -2238,7 +2238,7 @@
+         final String sourceArg = source != null ? source : getProject().getProperty(MagicNames.BUILD_JAVAC_SOURCE);
          if (sourceArg != null) {
              toExecute.createArgument().setValue("-source");
 -            toExecute.createArgument().setValue(sourceArg);
 +            toExecute.createArgument().setValue(LanguageLevel.adjust(sourceArg, "javadoc -source", this));
          }
+     }
  
-         if (linksource && doclet == null) {
 --- /dev/null
 +++ b/src/main/org/apache/tools/ant/taskdefs/LanguageLevel.java
 @@ -0,0 +1,62 @@

debian/patches/0015-javadoc-ignore-source-errors.patch

@@ -3,15 +3,16 @@ Author: Emmanuel Bourg <ebourg@apache.org>
 Forwarded: no
 --- a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
 +++ b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
-@@ -2276,6 +2276,11 @@
-             toExecute.createArgument().setValue(LanguageLevel.adjust(sourceArg, "javadoc -source", this));
-         }
+@@ -1858,6 +1858,12 @@
  
+         doTags(toExecute);
+         doSource(toExecute);
++
 +        if (doclet == null && LanguageLevel.isDebianBuild() && !LanguageLevel.isPreJava9()) {
 +            toExecute.createArgument().setValue("--ignore-source-errors");
 +            log("Debian build on Java 9+ detected: Adding the --ignore-source-errors option");
 +        }
 +
-         if (linksource && doclet == null) {
-             toExecute.createArgument().setValue("-linksource");
-         }
+         doLinkSource(toExecute);
+         doNoqualifier(toExecute);
+ 		

fetch.xml

@@ -8,7 +8,7 @@
    (the "License"); you may not use this file except in compliance with
    the License.  You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
@@ -329,14 +329,14 @@ Set -Ddest=LOCATION on the command line
     <f2 project="which"/>
   </target>
 
-  <target name="javamail"
-          description="load Java Mail"
+  <target name="jakartamail"
+          description="load Jakarta Mail"
           depends="init">
     <!-- We only need this one dependency as per
-      the project doc https://javaee.github.io/javamail/#Download_JavaMail_Release
+      the project doc https://eclipse-ee4j.github.io/mail/
       This alone should bring in all necessary dependencies (including the API
        jars and the activation jars -->
-    <f2 project="com.sun.mail" archive="javax.mail"/>
+    <f2 project="com.sun.mail" archive="jakarta.mail"/>
   </target>
 
   <target name="jspc"
@@ -359,6 +359,14 @@ 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"/>
@@ -389,5 +397,5 @@ Set -Ddest=LOCATION on the command line
   <target name="all"
     description="load all the libraries (except jython)"
     depends="antunit,ivy,logging,junit,junitlauncher,xml,networking,regexp,antlr,bcel,jdepend,bsf,debugging,script,
-      javamail,jspc,jai,xz,netrexx,junit-engine-vintage,junit-engine-jupiter"/>
+      jakartamail,jspc,jai,xz,netrexx,junit-engine-vintage,junit-engine-jupiter"/>
 </project>

get-m2.xml

@@ -8,7 +8,7 @@
    (the "License"); you may not use this file except in compliance with
    the License.  You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,

lib/libraries.properties

@@ -5,7 +5,7 @@
 # (the "License"); you may not use this file except in compliance with
 # the License.  You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -26,7 +26,10 @@ m2.antlib.url=${m2.url}/${m2.version}/binaries/${m2.jar.name}
 m2.sha1.checksum=b09be554228d66d208e5fef5266844aacf443abc
 
 # Repository to use by default for fetching dependencies.
-m2.repo=http://repo1.maven.org/maven2/
+m2.repo=https://repo1.maven.org/maven2/
+
+# hashes of libraries loaded over insecure connections
+netrexx.sha256=1f99f054e9b1e412d29823088f3fa7cfce90a7af25d907a60a6d7908a6b97ea4
 
 # Versions of different libraries. Please keep in alphabetical order, except
 # when a specific dependency forces them to be out-of-order
@@ -47,7 +50,7 @@ jakarta-regexp.version=1.4
 # Later versions of Tomcat provide a jspc task
 jasper-compiler.version=4.1.36
 jasper-runtime.version=${jasper-compiler.version}
-javax.mail.version=1.6.2
+jakarta.mail.version=1.6.3
 jdepend.version=2.9.1
 jruby.version=1.6.8
 junit.version=4.12