From e740694111a99da32f8e821a21b48a73eaae0b0b Mon Sep 17 00:00:00 2001
From: Gintas Grigelionis <gintas@apache.org>
Date: Mon, 25 Dec 2017 12:28:39 +0100
Subject: [PATCH] Update commons-net and fix compilation on Java 5

---
 WHATSNEW                             | 4 +++-
 fetch.xml                            | 1 +
 lib/libraries.properties             | 4 +++-
 src/etc/poms/ant-commons-net/pom.xml | 2 +-
 src/etc/poms/ant-javamail/pom.xml    | 2 +-
 src/etc/poms/ant-jdepend/pom.xml     | 2 +-
 6 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/WHATSNEW b/WHATSNEW
index c3a962560..2b383da3e 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -19,7 +19,7 @@ Fixed bugs:
    Bugzilla Report 60644
 
  * Improvement to the Zip task for reduced memory usage in certain
-   cases. Thanks to Glen Lewis for reporting the issue and 
+   cases. Thanks to Glen Lewis for reporting the issue and
    suggesting the fix.
    Bugzilla Report 19516
 
@@ -67,6 +67,8 @@ Other changes:
    for Ivy and AntUnit to facilitate releases and updates, respectively.
    Github Pull Request #50
 
+* Updated Commons Net to the latest Java 5 compatible version (2.2).
+
 Changes from Ant 1.9.8 TO Ant 1.9.9
 ===================================
 
diff --git a/fetch.xml b/fetch.xml
index dc8af7280..b92673eb8 100644
--- a/fetch.xml
+++ b/fetch.xml
@@ -315,6 +315,7 @@ Set -Ddest=LOCATION on the command line
           description="load Java Mail"
           depends="init">
     <f2 project="javax.mail" archive="javax.mail-api"/>
+    <f2 project="javax.activation" archive="activation"/>
   </target>
 
   <target name="jspc"
diff --git a/lib/libraries.properties b/lib/libraries.properties
index bc8cebd21..355daa30a 100644
--- a/lib/libraries.properties
+++ b/lib/libraries.properties
@@ -31,13 +31,15 @@ m2.repo=http://repo1.maven.org/maven2/
 # Versions of different libraries. Please keep in alphabetical order, except
 # when a specific dependency forces them to be out-of-order
 ivy.version=2.4.0
+activation.version=1.1.1
 ant-antunit.version=1.3
 antlr.version=2.7.7
 bcel.version=5.1
 bsf.version=2.4.0
 bsh.version=2.0b4
 bsh-core.version=${bsh.version}
-commons-net.version=1.4.1
+# Later versions are built with Java 6
+commons-net.version=2.2
 commons-logging.version=1.1
 commons-logging-api.version=${commons-logging.version}
 hamcrest-core.version=1.3
diff --git a/src/etc/poms/ant-commons-net/pom.xml b/src/etc/poms/ant-commons-net/pom.xml
index 45f6641ca..fe4d318d8 100644
--- a/src/etc/poms/ant-commons-net/pom.xml
+++ b/src/etc/poms/ant-commons-net/pom.xml
@@ -45,7 +45,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
     <dependency>
       <groupId>commons-net</groupId>
       <artifactId>commons-net</artifactId>
-      <version>1.4.1</version>
+      <version>2.2</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff --git a/src/etc/poms/ant-javamail/pom.xml b/src/etc/poms/ant-javamail/pom.xml
index 94c8cecd4..d6a3259e7 100644
--- a/src/etc/poms/ant-javamail/pom.xml
+++ b/src/etc/poms/ant-javamail/pom.xml
@@ -53,7 +53,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
     <dependency>
       <groupId>javax.activation</groupId>
       <artifactId>activation</artifactId>
-      <version>1.1</version>
+      <version>1.1.1</version>
       <scope>compile</scope>
     </dependency>
   </dependencies> 
diff --git a/src/etc/poms/ant-jdepend/pom.xml b/src/etc/poms/ant-jdepend/pom.xml
index d57b7795f..1e7fbda5b 100644
--- a/src/etc/poms/ant-jdepend/pom.xml
+++ b/src/etc/poms/ant-jdepend/pom.xml
@@ -47,7 +47,7 @@
     <dependency>
       <groupId>jdepend</groupId>
       <artifactId>jdepend</artifactId>
-      <version>2.7</version>
+      <version>2.9.1</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>