Update Maven Ant tasks, JUnit, and optional libraries

21 files changed, 526 insertions, 226 deletions

diff --git a/WHATSNEW b/WHATSNEW
index 4f928a411..fe9326bfc 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -73,7 +73,7 @@ Other changes:
    preserveLastModified attribute is set to true for that task
    Bugzilla Report 58589
 
- * zip and the related tasks can now set the modfication time of all
+ * zip and the related tasks can now set the modification time of all
    entries to a fixed timestamp.
    Github Pull Request #36
 
@@ -88,6 +88,13 @@ Other changes:
  * javah has been removed from Java 10. The task will now throw an
    exception if you try to use it while running Java 10 or newer.
 
+ * Updated Maven Ant Tasks, Jakarta Regexp and JUnit 4 to the latest
+   stable version (2.1.3, 1.4, and 4.12 respectively); updated
+   Java Mail API, JRuby and Jython to the latest Java 5 compatible
+   version (1.5.6, 1.6.8 and 2.5.3, respectively); added resolve target
+   for AntUnit to facilitate updates.
+   Github Pull Request #50
+
 Changes from Ant 1.10.0 TO Ant 1.10.1
 =====================================
 
diff --git a/fetch.xml b/fetch.xml
index 4ba35480c..899b0f399 100644
--- a/fetch.xml
+++ b/fetch.xml
@@ -23,48 +23,48 @@
 -->
 <project name="fetch" default="all" basedir=".">
 
-<description>
-  This build file downloads JAR files that optional Ant tasks use,
-  and installs them in a location that is accessible the next time Ant runs.
+  <description>
+This build file downloads JAR files that optional Ant tasks use,
+and installs them in a location that is accessible the next time Ant runs.
 
-  You can choose three locations, by going -Ddest=LOCATION on the command line
-  -Ddest=user     user lib dir  ${user.home}/.ant/lib
-  -Ddest=system   ant lib dir   ${ant.home}/lib
-  -Ddest=optional optional dir  $${basedir}/lib/optional  (for Ant developers)
+You can choose three locations, by going -Ddest=LOCATION on the command line
+-Ddest=user     user lib dir  ${user.home}/.ant/lib
+-Ddest=system   ant lib dir   ${ant.home}/lib
+-Ddest=optional optional dir  $${basedir}/lib/optional  (for Ant developers)
 
-  You may also need to set proxy settings. On Java1.5, Ant tries to get
-  this from the OS, unless you use the -noproxy option.
+You may also need to set proxy settings. On Java 1.5, Ant tries to get
+this from the OS, unless you use the -noproxy option.
 
-  Proxies can be configured manually setting the JVM proxy values in the
-  ANT_OPTS environment variable.
+Proxies can be configured manually setting the JVM proxy values in the
+ANT_OPTS environment variable.
 
-  For example, to set the proxy up in the tcsh shell, the command would be
-  something like:
+For example, to set the proxy up in the tcsh shell, the command would
+be something like:
 
-  For csh/tcsh:
-    setenv ANT_OPTS "-Dhttp.proxyHost=proxy -Dhttp.proxyPort=8080"
-  For bash:
-    export ANT_OPTS="-Dhttp.proxyHost=proxy -Dhttp.proxyPort=8080"
-  For Windows, set the environment variable in the appropriate dialog box
-  and open a new console. or, by hand
-    set ANT_OPTS = -Dhttp.proxyHost=proxy -Dhttp.proxyPort=8080
-</description>
+For csh/tcsh:
+ setenv ANT_OPTS "-Dhttp.proxyHost=proxy -Dhttp.proxyPort=8080"
+For bash:
+ export ANT_OPTS="-Dhttp.proxyHost=proxy -Dhttp.proxyPort=8080"
+For Windows, set the environment variable in the appropriate dialog box
+and open a new console. or, by hand
+ set ANT_OPTS = -Dhttp.proxyHost=proxy -Dhttp.proxyPort=8080
+  </description>
 
   <!-- Give user a chance to override without editing this file
        (and without typing -D each time it compiles it) -->
   <property file="${user.home}/.ant/ant.properties"/>
-  <property name="lib.dir" location="lib" />
-  <property name="optional.dir" location="${lib.dir}/optional" />
-  <property name="userlib.dir" location="${user.home}/.ant/lib" />
+  <property name="lib.dir" location="lib"/>
+  <property name="optional.dir" location="${lib.dir}/optional"/>
+  <property name="userlib.dir" location="${user.home}/.ant/lib"/>
 
-  <!-- load in our properties table -->
+  <!-- Load in our properties table -->
   <property file="${lib.dir}/libraries.properties"/>
 
   <!-- Temporary cache for working files -->
-  <property name="temp.dir" location="${user.home}/.ant/tempcache" />
-  <property name="keep.temp.dir" value="true" />
+  <property name="temp.dir" location="${user.home}/.ant/tempcache"/>
+  <property name="keep.temp.dir" value="true"/>
 
-  <import file="get-m2.xml" />
+  <import file="get-m2.xml"/>
 
   <target name="pick-dest">
     <fail>
@@ -80,49 +80,57 @@ Set -Ddest=LOCATION on the command line
     </fail>
 
     <condition property="dest.dir"
-      value="${lib.dir}">
-      <equals arg1="${dest}" arg2="system" />
+               value="${lib.dir}">
+      <equals arg1="${dest}" arg2="system"/>
     </condition>
     <condition property="dest.dir"
-      value="${optional.dir}">
-      <equals arg1="${dest}" arg2="optional" />
+               value="${optional.dir}">
+      <equals arg1="${dest}" arg2="optional"/>
     </condition>
     <condition property="dest.dir"
-      value="${userlib.dir}">
-      <equals arg1="${dest}" arg2="user" />
+               value="${userlib.dir}">
+      <equals arg1="${dest}" arg2="user"/>
     </condition>
     <fail unless="dest.dir">Unknown destination : ${dest}</fail>
     <echo>Downloading to ${dest.dir}</echo>
-    <property name="m2.dest.dir" value="${dest.dir}" />
+    <property name="m2.dest.dir" value="${dest.dir}"/>
   </target>
 
 
   <target name="macros" depends="pick-dest,get-m2"
-    xmlns:artifact="antlib:org.apache.maven.artifact.ant">
-
+          xmlns:artifact="antlib:org.apache.maven.artifact.ant">
+    <fail>
+      Cannot execute multiple targets due to the bug in Maven Ant tasks
+      <condition>
+        <contains string="${ant.project.invoked-targets}" substring=","/>
+      </condition>
+    </fail>
     <macrodef name="f2">
-      <attribute name="project" />
+      <attribute name="project"/>
       <attribute name="archive" default="@{project}"/>
       <attribute name="repository" default="${m2.repo}"/>
       <sequential>
         <fail>
-        Unknown archive @{archive} -no property @{archive}.version defined in ${lib.dir}/libraries.properties.
+          Unknown archive @{archive} -no property @{archive}.version defined in ${lib.dir}/libraries.properties.
           <condition>
             <not>
-            <isset property="@{archive}.version"/>
+              <isset property="@{archive}.version"/>
             </not>
           </condition>
         </fail>
-        <artifact:dependencies pathID="@{archive}.path">
-          <dependency groupID="@{project}"
-            artifactID="@{archive}"
-            version="${@{archive}.version}"/>
-          <remoteRepository url="@{repository}" />
+        <artifact:remoteRepository url="@{repository}" id="central"/>
+        <artifact:dependencies pathID="@{archive}.path" useScope="runtime">
+          <dependency groupId="@{project}"
+                      artifactId="@{archive}"
+                      version="${@{archive}.version}">
+            <!-- exclude dependencies of ant-antunit (they should be in optional scope) -->
+            <exclusion groupId="org.apache.ant" artifactId="ant"/>
+            <exclusion groupId="org.apache.ant" artifactId="ant-launcher"/>
+          </dependency>
         </artifact:dependencies>
-        <!-- now we are left with the problem of getting the files
-             into our directory -->
+        <!-- now we are left with the problem of getting the files into our directory -->
         <copy todir="${dest.dir}">
-          <path refid="@{archive}.path" />
+          <path refid="@{archive}.path"/>
           <flattenmapper/>
         </copy>
       </sequential>
@@ -131,43 +139,41 @@ Set -Ddest=LOCATION on the command line
 
   <target name="nonm2-macros" depends="pick-dest">
     <macrodef name="get-ftp-file">
-      <attribute name="host" />
+      <attribute name="host"/>
       <attribute name="port" default="21"/>
-      <attribute name="remotedir" />
-      <attribute name="filename" />
-      <attribute name="localdir" default="${dest.dir}" />
+      <attribute name="remotedir"/>
+      <attribute name="filename"/>
+      <attribute name="localdir" default="${dest.dir}"/>
       <attribute name="user" default="anonymous"/>
       <attribute name="pw" default="anonymous"/>
       <sequential>
         <ftp server="@{host}" port="@{port}" userid="@{user}" password="@{pw}" passive="true"
-            remotedir="@{remotedir}" action="get" depends="true" preserveLastModified="true"
-            skipFailedTransfers="true">
+             remotedir="@{remotedir}" action="get" depends="true" preserveLastModified="true"
+             skipFailedTransfers="true">
           <fileset dir="@{localdir}">
-            <include name="@{filename}" />
+            <include name="@{filename}"/>
           </fileset>
         </ftp>
       </sequential>
     </macrodef>
-
   </target>
 
 
-
   <!-- any init stuff -->
-  <target name="init" depends="macros" />
+  <target name="init" depends="macros"/>
 
-  <target name="init-no-m2" depends="nonm2-macros" />
+  <target name="init-no-m2" depends="nonm2-macros"/>
 
   <target name="init-cache">
-    <available property="temp.cache.already.exists" file="${temp.dir}" type="dir" />
+    <available property="temp.cache.already.exists" file="${temp.dir}" type="dir"/>
     <condition property="user.wants.temp.cache">
       <and>
-        <isset property="keep.temp.dir" />
+        <isset property="keep.temp.dir"/>
         <not>
           <or>
-            <equals arg1="${keep.temp.dir}" arg2="false" casesensitive="false" />
-            <equals arg1="${keep.temp.dir}" arg2="no" casesensitive="false" />
-            <equals arg1="${keep.temp.dir}" arg2="off" casesensitive="false" />
+            <equals arg1="${keep.temp.dir}" arg2="false" casesensitive="false"/>
+            <equals arg1="${keep.temp.dir}" arg2="no" casesensitive="false"/>
+            <equals arg1="${keep.temp.dir}" arg2="off" casesensitive="false"/>
           </or>
         </not>
       </and>
@@ -175,174 +181,190 @@ Set -Ddest=LOCATION on the command line
     <condition property="delete.temp.cache">
       <and>
         <not>
-          <isset property="temp.cache.already.exists" />
+          <isset property="temp.cache.already.exists"/>
         </not>
         <not>
-          <isset property="user.wants.temp.cache" />
+          <isset property="user.wants.temp.cache"/>
         </not>
       </and>
     </condition>
   </target>
 
   <target name="-setup-temp-cache" depends="init-cache" unless="temp.cache.already.exists"
-          description="Setup temporary cache for downloaded files">
-    <mkdir dir="${temp.dir}" />
+          description="Set up temporary cache for downloaded files">
+    <mkdir dir="${temp.dir}"/>
   </target>
 
   <target name="-cleanup-temp-cache" depends="init-cache" if="delete.temp.cache"
-          description="Gets rid of the temporary cache directory">
-    <delete dir="${temp.dir}" />
+          description="Get rid of the temporary cache directory">
+    <delete dir="${temp.dir}"/>
   </target>
 
 
   <target name="diag" depends="init">
-    <echoproperties />
+    <echoproperties/>
+  </target>
+
+  <target name="antunit"
+          description="load AntUnit library"
+          depends="init">
+    <f2 project="org.apache.ant" archive="ant-antunit"/>
   </target>
 
   <target name="ivy"
-    description="load Ivy dependency manager"
-    depends="init">
-    <f2 project="org.apache.ivy" archive="ivy" />
+          description="load Ivy dependency manager"
+          depends="init">
+    <f2 project="org.apache.ivy" archive="ivy"/>
   </target>
 
   <target name="logging"
-    description="load logging libraries"
-    depends="init">
-    <f2 project="log4j" />
-    <f2 project="commons-logging" archive="commons-logging-api" />
+          description="load logging libraries (Commons and Log4j)"
+          depends="init">
+    <f2 project="log4j"/>
+    <f2 project="commons-logging" archive="commons-logging-api"/>
   </target>
 
   <target name="junit"
-    description="load junit libraries"
-    depends="init">
-    <f2 project="junit" />
+          description="load JUnit libraries"
+          depends="init">
+    <f2 project="junit"/>
+    <f2 project="org.hamcrest" archive="hamcrest-library"/>
   </target>
 
   <target name="xml"
-    description="load full XML libraries (xalan, resolver)"
-    depends="init">
-    <f2 project="xalan" />
-    <f2 project="xml-resolver" />
+          description="load full XML libraries (Xalan and xml-resolver)"
+          depends="init">
+    <f2 project="xalan"/>
+    <f2 project="xml-resolver"/>
   </target>
 
   <target name="networking"
-    description="load networking libraries (commons-net; jsch)"
-    depends="init">
-    <f2 project="commons-net" />
+          description="load networking libraries (commons-net and JSch)"
+          depends="init">
+    <f2 project="commons-net"/>
     <f2 project="com.jcraft" archive="jsch"/>
   </target>
 
   <target name="regexp"
-    description="load regexp libraries"
-    depends="init">
-    <f2 project="regexp" />
-    <f2 project="oro" />
+          description="load regexp libraries"
+          depends="init">
+    <f2 project="jakarta-regexp"/>
+    <f2 project="oro"/>
   </target>
 
   <target name="antlr"
-    description="load antlr libraries"
-    depends="init">
-    <f2 project="antlr" />
+          description="load ANother Tool for Language Recognition (ANTLR)"
+          depends="init">
+    <f2 project="antlr"/>
   </target>
 
   <target name="bcel"
-    description="load bcel libraries"
-    depends="init">
-    <copy todir="${dest.dir}">
-      <url url="${m2.url}/org/apache/bcel/bcel/${bcel.version}/bcel-${bcel.version}.jar"/>
-      <flattenmapper/>
-    </copy>
+          description="load Byte Code Engineering Library (BCEL)"
+          depends="init">
+    <f2 project="org.apache.bcel" archive="bcel"/>
   </target>
 
   <target name="jdepend"
-    description="load jdepend libraries"
-    depends="init">
-    <f2 project="jdepend" />
+          description="load JDepend libraries"
+          depends="init">
+    <f2 project="jdepend"/>
   </target>
 
   <target name="bsf"
-    description="load bsf libraries"
-    depends="init">
-    <f2 project="bsf" />
+          description="load Bean Scripting Framework"
+          depends="init">
+    <f2 project="bsf"/>
   </target>
 
   <target name="jruby"
-          description="load jruby"
+          description="load JRuby"
           depends="bsf">
     <f2 project="org.jruby" archive="jruby"/>
   </target>
 
   <target name="beanshell"
-          description="load beanshell support"
+          description="load BeanShell support"
           depends="bsf">
     <f2 project="org.beanshell" archive="bsh"/>
     <f2 project="org.beanshell" archive="bsh-core"/>
   </target>
 
   <target name="jython"
-          description="load jython"
+          description="load Jython"
           depends="bsf">
-    <f2 project="jython" archive="jython"/>
+    <f2 project="org.python" archive="jython"/>
   </target>
 
   <target name="rhino"
-          description="load rhino"
+          description="load Rhino"
           depends="bsf">
-    <f2 project="rhino" archive="js"/>
+    <f2 project="org.mozilla" archive="rhino"/>
   </target>
 
   <target name="script"
-          description="load script languages (except jython)"
+          description="load script languages (except Jython)"
           depends="bsf,jruby,beanshell,rhino"/>
 
   <target name="debugging"
-    description="internal ant debugging"
+    description="internal Ant debugging"
     depends="init">
-    <f2 project="which" />
+    <f2 project="which"/>
   </target>
 
-  <target name="javamail" depends="init"
-          description="load javamail">
-    <f2 project="javax.mail" archive="mail"/>
+  <target name="javamail"
+          description="load Java Mail"
+          depends="init">
+    <f2 project="javax.mail" archive="javax.mail-api"/>
   </target>
 
-  <target name="jspc" depends="init" description="loads Jasper">
+  <target name="jspc"
+          description="load Jasper"
+          depends="init">
     <f2 project="tomcat" archive="jasper-compiler"/>
     <f2 project="tomcat" archive="jasper-runtime"/>
     <f2 project="javax.servlet" archive="servlet-api"/>
   </target>
 
-  <target name="jai" depends="init"
-          description="load java advanced imaging">
-    <f2 project="javax.media" archive="jai-core" repository="https://repository.jboss.org/nexus/content/groups/public/"/>
-    <f2 project="com.sun.media" archive="jai-codec" repository="https://repository.jboss.org/nexus/content/groups/public/"/>
+  <target name="jai"
+          description="load Java Advanced Imaging"
+          depends="init">
+    <f2 project="javax.media" archive="jai-core"
+        repository="https://repository.jboss.org/nexus/content/groups/public/"/>
+    <f2 project="com.sun.media" archive="jai-codec"
+        repository="https://repository.jboss.org/nexus/content/groups/public/"/>
   </target>
 
-  <target name="netrexx" depends="init-no-m2,-setup-temp-cache,-fetch-netrexx,-fetch-netrexx-no-commons-net"
-          description="load NetRexx compiler">
+  <target name="netrexx"
+          description="load NetRexx compiler"
+          depends="init-no-m2,-setup-temp-cache,-fetch-netrexx,-fetch-netrexx-no-commons-net">
     <copy todir="${dest.dir}" flatten="true">
       <zipfileset src="${temp.dir}/NetRexx.zip">
-        <include name="NetRexx\lib\NetRexxC.jar" />
-        <include name="NetRexx\browse\license.txt" />
+        <include name="NetRexx\lib\NetRexxC.jar"/>
+        <include name="NetRexx\browse\license.txt"/>
       </zipfileset>
     </copy>
     <antcall target="-cleanup-temp-cache"/>
   </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}" />
+            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"/>
+    <get src="ftp://ftp.software.ibm.com/software/awdtools/netrexx/NetRexx.zip"
+         dest="${temp.dir}/NetRexx.zip" skipexisting="true"/>
   </target>
 
-  <target name="xz" depends="init" description="loads XZ for Java">
+  <target name="xz"
+          description="load XZ for Java"
+          depends="init">
     <f2 project="org.tukaani" archive="xz"/>
   </target>
 
   <target name="all"
     description="load all the libraries (except jython)"
-    depends="ivy,logging,junit,xml,networking,regexp,antlr,bcel,jdepend,bsf,debugging,script,javamail,jspc,jai,xz,netrexx" />
-
+    depends="antunit,ivy,logging,junit,xml,networking,regexp,antlr,bcel,jdepend,bsf,debugging,script,javamail,jspc,jai,xz,netrexx"/>
 </project>
diff --git a/lib/libraries.properties b/lib/libraries.properties
index f947ce94a..131d140ab 100644
--- a/lib/libraries.properties
+++ b/lib/libraries.properties
@@ -13,25 +13,25 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-#this file declares the libraries for use in 
-#a given release of the components
+# This file declares the libraries for use in a given release of the components
 
-#if you change this, change the checksum to match
-m2.version=2.0.4
-m2.url=http\://repo1.maven.org/maven2
-m2.artifact-name=maven-artifact-ant
-m2.jar.name=${m2.artifact-name}-${m2.version}-dep.jar
+# 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.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.
-m2.antlib.url=${m2.url}/org/apache/maven/${m2.artifact-name}/${m2.version}/${m2.jar.name}
+m2.antlib.url=${m2.url}/${m2.version}/binaries/${m2.jar.name}
 #this is the sha1 checksum of the artifact
-m2.sha1.checksum=4e7ddfdb91600e9b59bb965ff8eef2f06015df50
+m2.sha1.checksum=b09be554228d66d208e5fef5266844aacf443abc
 
 # Repository to use by default for fetching dependencies.
 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
+# 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
+ant-antunit.version=1.3
 antlr.version=2.7.7
 bcel.version=6.2
 bsf.version=2.4.0
@@ -40,28 +40,32 @@ bsh-core.version=${bsh.version}
 commons-net.version=1.4.1
 commons-logging.version=1.1
 commons-logging-api.version=${commons-logging.version}
+hamcrest-core.version=1.3
+hamcrest-library.version=${hamcrest-core.version}
 jai-core.version=1.1.3
 jai-codec.version=1.1.3
+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}
+# Later versions are built with Java 7
+javax.mail-api.version=1.5.6
 jdepend.version=2.9.1
-jruby.version=0.9.8
-junit.version=4.11
+# Later versions are built with Java 7
+jruby.version=1.6.8
+junit.version=4.12
+# Later versions are built with Java 6
+rhino.version=1.7R5
 jsch.version=0.1.54
-jython.version=2.1
-#log4j 1.2.15 requires JMS and a few other Sun jars that are not in the m2 repo
+jython.version=2.5.3
+# log4j 1.2.15 requires JMS and a few other Sun jars that are not in the m2 repo
 log4j.version=1.2.14
-#js is the javascript implementation of the rhino project
-#17R1 is compiled with Java5 so we can't use the jar when building with JDK 1.4
-js.version=1.6R7
 oro.version=2.0.8
-regexp.version=1.3
 servlet-api.version=2.3
 which.version=1.0
 xalan.version=2.7.2
 xml-resolver.version=1.2
-mail.version=1.4
 xz.version=1.6
-#paired
+# paired
 jacl.version=1.2.6
 tcljava.version=${jacl.version}
diff --git a/lib/optional/LICENSE.junit4.html b/lib/optional/LICENSE.junit4.html
new file mode 100644
index 000000000..181153ef3
--- /dev/null
+++ b/lib/optional/LICENSE.junit4.html
@@ -0,0 +1,261 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Public License - Version 1.0</title>
+<style type="text/css">
+  body {
+    size: 8.5in 11.0in;
+    margin: 0.25in 0.5in 0.25in 0.5in;
+    tab-interval: 0.5in;
+    }
+  p {
+    margin-left: auto;
+    margin-top:  0.5em;
+    margin-bottom: 0.5em;
+    }
+  p.list {
+  	margin-left: 0.5in;
+    margin-top:  0.05em;
+    margin-bottom: 0.05em;
+    }
+  </style>
+
+</head>
+
+<body lang="EN-US">
+
+<h2>Eclipse Public License - v 1.0</h2>
+
+<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR
+DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
+AGREEMENT.</p>
+
+<p><b>1. DEFINITIONS</b></p>
+
+<p>&quot;Contribution&quot; means:</p>
+
+<p class="list">a) in the case of the initial Contributor, the initial
+code and documentation distributed under this Agreement, and</p>
+<p class="list">b) in the case of each subsequent Contributor:</p>
+<p class="list">i) changes to the Program, and</p>
+<p class="list">ii) additions to the Program;</p>
+<p class="list">where such changes and/or additions to the Program
+originate from and are distributed by that particular Contributor. A
+Contribution 'originates' from a Contributor if it was added to the
+Program by such Contributor itself or anyone acting on such
+Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii)
+are not derivative works of the Program.</p>
+
+<p>&quot;Contributor&quot; means any person or entity that distributes
+the Program.</p>
+
+<p>&quot;Licensed Patents&quot; mean patent claims licensable by a
+Contributor which are necessarily infringed by the use or sale of its
+Contribution alone or when combined with the Program.</p>
+
+<p>&quot;Program&quot; means the Contributions distributed in accordance
+with this Agreement.</p>
+
+<p>&quot;Recipient&quot; means anyone who receives the Program under
+this Agreement, including all Contributors.</p>
+
+<p><b>2. GRANT OF RIGHTS</b></p>
+
+<p class="list">a) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works
+of, publicly display, publicly perform, distribute and sublicense the
+Contribution of such Contributor, if any, and such derivative works, in
+source code and object code form.</p>
+
+<p class="list">b) Subject to the terms of this Agreement, each
+Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell,
+offer to sell, import and otherwise transfer the Contribution of such
+Contributor, if any, in source code and object code form. This patent
+license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor,
+such addition of the Contribution causes such combination to be covered
+by the Licensed Patents. The patent license shall not apply to any other
+combinations which include the Contribution. No hardware per se is
+licensed hereunder.</p>
+
+<p class="list">c) Recipient understands that although each Contributor
+grants the licenses to its Contributions set forth herein, no assurances
+are provided by any Contributor that the Program does not infringe the
+patent or other intellectual property rights of any other entity. Each
+Contributor disclaims any liability to Recipient for claims brought by
+any other entity based on infringement of intellectual property rights
+or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to
+secure any other intellectual property rights needed, if any. For
+example, if a third party patent license is required to allow Recipient
+to distribute the Program, it is Recipient's responsibility to acquire
+that license before distributing the Program.</p>
+
+<p class="list">d) Each Contributor represents that to its knowledge it
+has sufficient copyright rights in its Contribution, if any, to grant
+the copyright license set forth in this Agreement.</p>
+
+<p><b>3. REQUIREMENTS</b></p>
+
+<p>A Contributor may choose to distribute the Program in object code
+form under its own license agreement, provided that:</p>
+
+<p class="list">a) it complies with the terms and conditions of this
+Agreement; and</p>
+
+<p class="list">b) its license agreement:</p>
+
+<p class="list">i) effectively disclaims on behalf of all Contributors
+all warranties and conditions, express and implied, including warranties
+or conditions of title and non-infringement, and implied warranties or
+conditions of merchantability and fitness for a particular purpose;</p>
+
+<p class="list">ii) effectively excludes on behalf of all Contributors
+all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;</p>
+
+<p class="list">iii) states that any provisions which differ from this
+Agreement are offered by that Contributor alone and not by any other
+party; and</p>
+
+<p class="list">iv) states that source code for the Program is available
+from such Contributor, and informs licensees how to obtain it in a
+reasonable manner on or through a medium customarily used for software
+exchange.</p>
+
+<p>When the Program is made available in source code form:</p>
+
+<p class="list">a) it must be made available under this Agreement; and</p>
+
+<p class="list">b) a copy of this Agreement must be included with each
+copy of the Program.</p>
+
+<p>Contributors may not remove or alter any copyright notices contained
+within the Program.</p>
+
+<p>Each Contributor must identify itself as the originator of its
+Contribution, if any, in a manner that reasonably allows subsequent
+Recipients to identify the originator of the Contribution.</p>
+
+<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
+
+<p>Commercial distributors of software may accept certain
+responsibilities with respect to end users, business partners and the
+like. While this license is intended to facilitate the commercial use of
+the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create
+potential liability for other Contributors. Therefore, if a Contributor
+includes the Program in a commercial product offering, such Contributor
+(&quot;Commercial Contributor&quot;) hereby agrees to defend and
+indemnify every other Contributor (&quot;Indemnified Contributor&quot;)
+against any losses, damages and costs (collectively &quot;Losses&quot;)
+arising from claims, lawsuits and other legal actions brought by a third
+party against the Indemnified Contributor to the extent caused by the
+acts or omissions of such Commercial Contributor in connection with its
+distribution of the Program in a commercial product offering. The
+obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In
+order to qualify, an Indemnified Contributor must: a) promptly notify
+the Commercial Contributor in writing of such claim, and b) allow the
+Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own
+expense.</p>
+
+<p>For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those
+performance claims and warranties, and if a court requires any other
+Contributor to pay any damages as a result, the Commercial Contributor
+must pay those damages.</p>
+
+<p><b>5. NO WARRANTY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
+PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS
+OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
+ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
+OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to
+the risks and costs of program errors, compliance with applicable laws,
+damage to or loss of data, programs or equipment, and unavailability or
+interruption of operations.</p>
+
+<p><b>6. DISCLAIMER OF LIABILITY</b></p>
+
+<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
+NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
+DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
+HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
+
+<p><b>7. GENERAL</b></p>
+
+<p>If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further action
+by the parties hereto, such provision shall be reformed to the minimum
+extent necessary to make such provision valid and enforceable.</p>
+
+<p>If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other
+software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the
+date such litigation is filed.</p>
+
+<p>All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of time
+after becoming aware of such noncompliance. If all Recipient's rights
+under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive.</p>
+
+<p>Everyone is permitted to copy and distribute copies of this
+Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The
+Agreement Steward reserves the right to publish new versions (including
+revisions) of this Agreement from time to time. No one other than the
+Agreement Steward has the right to modify this Agreement. The Eclipse
+Foundation is the initial Agreement Steward. The Eclipse Foundation may
+assign the responsibility to serve as the Agreement Steward to a
+suitable separate entity. Each new version of the Agreement will be
+given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version
+of the Agreement is published, Contributor may elect to distribute the
+Program (including its Contributions) under the new version. Except as
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
+rights or licenses to the intellectual property of any Contributor under
+this Agreement, whether expressly, by implication, estoppel or
+otherwise. All rights in the Program not expressly granted under this
+Agreement are reserved.</p>
+
+<p>This Agreement is governed by the laws of the State of New York and
+the intellectual property laws of the United States of America. No party
+to this Agreement will bring a legal action under this Agreement more
+than one year after the cause of action arose. Each party waives its
+rights to a jury trial in any resulting litigation.</p>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/lib/optional/README b/lib/optional/README
index a7f22222a..b3eec1422 100644
--- a/lib/optional/README
+++ b/lib/optional/README
@@ -1,4 +1,5 @@
-The file junit-3.8.2.jar is version 3.8.2 of JUnit, whereas junit-4.8.1.jar is
-version 4.8.1 with the junit.** classes removed (except for the 3.x -> 4.x
-adapter); see the file LICENSE.junit.html for the terms of distribution. For
+This directory contains the latest distributions of both JUnit 3 and 4 for testing of junit task;
+for proper execution, JUnit 3 must come on classpath before JUnit 4.
+
+See the files LICENSE.junit.html respectively LICENSE.junit4.html for the terms of distribution. For
 more information about JUnit or the latest release, see <http://www.junit.org/>.
diff --git a/lib/optional/hamcrest-library-1.3.jar b/lib/optional/hamcrest-library-1.3.jar
new file mode 100644
index 000000000..9eac80d7b
--- /dev/null
+++ b/lib/optional/hamcrest-library-1.3.jar
diff --git a/lib/optional/junit-4.11.jar b/lib/optional/junit-4.11.jar
deleted file mode 100644
index aaf744484..000000000
--- a/lib/optional/junit-4.11.jar
+++ /dev/null
diff --git a/lib/optional/junit-4.12.jar b/lib/optional/junit-4.12.jar
new file mode 100644
index 000000000..3a7fc266c
--- /dev/null
+++ b/lib/optional/junit-4.12.jar
diff --git a/release/ivy.xml b/release/ivy.xml
index c146ea1e2..ac8c9d756 100644
--- a/release/ivy.xml
+++ b/release/ivy.xml
@@ -15,155 +15,154 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<ivy-module version="2.0" 
+<ivy-module version="2.0"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:noNamespaceSchemaLocation=
-	    "http://ant.apache.org/ivy/schemas/ivy.xsd">
+            xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
   <info organisation="org/apache"
         module="ant" revision="1.10.2"/>
-  <publications xmlns:e="urn:ant.apache.org:ivy-extras">  
+  <publications xmlns:e="urn:ant.apache.org:ivy-extras">
     <artifact name="ant-parent" type="pom" ext="pom"/>
     <artifact name="ant-parent" type="pom.asc" ext="pom.asc"/>
     <artifact name="ant" type="pom" ext="pom"/>
     <artifact name="ant" type="pom.asc" ext="pom.asc"/>
     <artifact name="ant" type="jar" ext="jar"/>
     <artifact name="ant" type="jar.asc" ext="jar.asc"/>
-    <artifact name="ant" type="source" ext="jar" e:classifier="sources" />
-    <artifact name="ant" type="source.asc" ext="jar.asc" e:classifier="sources" />
-    <artifact name="ant" type="javadoc" ext="jar" e:classifier="javadoc" />
-    <artifact name="ant" type="javadoc.asc" ext="jar.asc" e:classifier="javadoc" />
+    <artifact name="ant" type="source" ext="jar" e:classifier="sources"/>
+    <artifact name="ant" type="source.asc" ext="jar.asc" e:classifier="sources"/>
+    <artifact name="ant" type="javadoc" ext="jar" e:classifier="javadoc"/>
+    <artifact name="ant" type="javadoc.asc" ext="jar.asc" e:classifier="javadoc"/>
     <artifact name="ant-antlr" type="pom" ext="pom"/>
     <artifact name="ant-antlr" type="pom.asc" ext="pom.asc"/>
     <artifact name="ant-antlr" type="jar" ext="jar"/>
     <artifact name="ant-antlr" type="jar.asc" ext="jar.asc"/>
-    <artifact name="ant-antlr" type="source" ext="jar" e:classifier="sources" />
-    <artifact name="ant-antlr" type="source.asc" ext="jar.asc" e:classifier="sources" />
+    <artifact name="ant-antlr" type="source" ext="jar" e:classifier="sources"/>
+    <artifact name="ant-antlr" type="source.asc" ext="jar.asc" e:classifier="sources"/>
     <artifact name="ant-apache-bcel" type="pom" ext="pom"/>
     <artifact name="ant-apache-bcel" type="pom.asc" ext="pom.asc"/>
     <artifact name="ant-apache-bcel" type="jar" ext="jar"/>
     <artifact name="ant-apache-bcel" type="jar.asc" ext="jar.asc"/>
-    <artifact name="ant-apache-bcel" type="source" ext="jar" e:classifier="sources" />
-    <artifact name="ant-apache-bcel" type="source.asc" ext="jar.asc" e:classifier="sources" />
+    <artifact name="ant-apache-bcel" type="source" ext="jar" e:classifier="sources"/>
+    <artifact name="ant-apache-bcel" type="source.asc" ext="jar.asc" e:classifier="sources"/>
     <artifact name="ant-apache-bsf" type="pom" ext="pom"/>
     <artifact name="ant-apache-bsf" type="pom.asc" ext="pom.asc"/>
     <artifact name="ant-apache-bsf" type="jar" ext="jar"/>
     <artifact name="ant-apache-bsf" type="jar.asc" ext="jar.asc"/>
-    <artifact name="ant-apache-bsf" type="source" ext="jar" e:classifier="sources" />
-    <artifact name="ant-apache-bsf" type="source.asc" ext="jar.asc" e:classifier="sources" />
+    <artifact name="ant-apache-bsf" type="source" ext="jar" e:classifier="sources"/>
+    <artifact name="ant-apache-bsf" type="source.asc" ext="jar.asc" e:classifier="sources"/>
     <artifact name="ant-apache-log4j" type="pom" ext="pom"/>
     <artifact name="ant-apache-log4j" type="pom.asc" ext="pom.asc"/>
     <artifact name="ant-apache-log4j" type="jar" ext="jar"/>
     <artifact name="ant-apache-log4j" type="jar.asc" ext="jar.asc"/>
-    <artifact name="ant-apache-log4j" type="source" ext="jar" e:classifier="sources" />
-    <artifact name="ant-apache-log4j" type="source.asc" ext="jar.asc" e:classifier="sources" />
+    <artifact name="ant-apache-log4j" type="source" ext="jar" e:classifier="sources"/>
+    <artifact name="ant-apache-log4j" type="source.asc" ext="jar.asc" e:classifier="sources"/>
     <artifact name="ant-apache-oro" type="pom" ext="pom"/>
     <artifact name="ant-apache-oro" type="pom.asc" ext="pom.asc"/>
     <artifact name="ant-apache-oro" type="jar" ext="jar"/>
     <artifact name="ant-apache-oro" type="jar.asc" ext="jar.asc"/>
-    <artifact name="ant-apache-oro" type="source" ext="jar" e:classifier="sources" />
-    <artifact name="ant-apache-oro" type="source.asc" ext="jar.asc" e:classifier="sources" />
+    <artifact name="ant-apache-oro" type="source" ext="jar" e:classifier="sources"/>
+    <artifact name="ant-apache-oro" type="source.asc" ext="jar.asc" e:classifier="sources"/>
     <artifact name="ant-apache-regexp" type="pom" ext="pom"/>
     <artifact name="ant-apache-regexp" type="pom.asc" ext="pom.asc"/>
     <artifact name="ant-apache-regexp" type="jar" ext="jar"/>
     <artifact name="ant-apache-regexp" type="jar.asc" ext="jar.asc"/>
-    <artifact name="ant-apache-regexp" type="source" ext="jar" e:classifier="sources" />
-    <artifact name="ant-apache-regexp" type="source.asc" ext="jar.asc" e:classifier="sources" />
+    <artifact name="ant-apache-regexp" type="source" ext="jar" e:classifier="sources"/>
+    <artifact name="ant-apache-regexp" type="source.asc" ext="jar.asc" e:classifier="sources"/>
     <artifact name="ant-apache-resolver" type="pom" ext="pom"/>
     <artifact name="ant-apache-resolver" type="pom.asc" ext="pom.asc"/>
     <artifact name="ant-apache-resolver" type="jar" ext="jar"/>
     <artifact name="ant-apache-resolver" type="jar.asc" ext="jar.asc"/>
-    <artifact name="ant-apache-resolver" type="source" ext="jar" e:classifier="sources" />
-    <artifact name="ant-apache-resolver" type="source.asc" ext="jar.asc" e:classifier="sources" />
+    <artifact name="ant-apache-resolver" type="source" ext="jar" e:classifier="sources"/>
+    <artifact name="ant-apache-resolver" type="source.asc" ext="jar.asc" e:classifier="sources"/>
     <artifact name="ant-apache-xalan2" type="pom" ext="pom"/>
     <artifact name="ant-apache-xalan2" type="pom.asc" ext="pom.asc"/>
     <artifact name="ant-apache-xalan2" type="jar" ext="jar"/>
     <artifact name="ant-apache-xalan2" type="jar.asc" ext="jar.asc"/>
-    <artifact name="ant-apache-xalan2" type="source" ext="jar" e:classifier="sources" />
-    <artifact name="ant-apache-xalan2" type="source.asc" ext="jar.asc" e:classifier="sources" />
+    <artifact name="ant-apache-xalan2" type="source" ext="jar" e:classifier="sources"/>
+    <artifact name="ant-apache-xalan2" type="source.asc" ext="jar.asc" e:classifier="sources"/>
     <artifact name="ant-commons-logging" type="pom" ext="pom"/>
     <artifact name="ant-commons-logging" type="pom.asc" ext="pom.asc"/>
     <artifact name="ant-commons-logging" type="jar" ext="jar"/>
     <artifact name="ant-commons-logging" type="jar.asc" ext="jar.asc"/>
-    <artifact name="ant-commons-logging" type="source" ext="jar" e:classifier="sources" />
-    <artifact name="ant-commons-logging" type="source.asc" ext="jar.asc" e:classifier="sources" />
+    <artifact name="ant-commons-logging" type="source" ext="jar" e:classifier="sources"/>
+    <artifact name="ant-commons-logging" type="source.asc" ext="jar.asc" e:classifier="sources"/>
     <artifact name="ant-commons-net" type="pom" ext="pom"/>
     <artifact name="ant-commons-net" type="pom.asc" ext="pom.asc"/>
     <artifact name="ant-commons-net" type="jar" ext="jar"/>
     <artifact name="ant-commons-net" type="jar.asc" ext="jar.asc"/>
-    <artifact name="ant-commons-net" type="source" ext="jar" e:classifier="sources" />
-    <artifact name="ant-commons-net" type="source.asc" ext="jar.asc" e:classifier="sources" />
+    <artifact name="ant-commons-net" type="source" ext="jar" e:classifier="sources"/>
+    <artifact name="ant-commons-net" type="source.asc" ext="jar.asc" e:classifier="sources"/>
     <artifact name="ant-jai" type="pom" ext="pom"/>
     <artifact name="ant-jai" type="pom.asc" ext="pom.asc"/>
     <artifact name="ant-jai" type="jar" ext="jar"/>
     <artifact name="ant-jai" type="jar.asc" ext="jar.asc"/>
-    <artifact name="ant-jai" type="source" ext="jar" e:classifier="sources" />
-    <artifact name="ant-jai" type="source.asc" ext="jar.asc" e:classifier="sources" />
+    <artifact name="ant-jai" type="source" ext="jar" e:classifier="sources"/>
+    <artifact name="ant-jai" type="source.asc" ext="jar.asc" e:classifier="sources"/>
     <artifact name="ant-javamail" type="pom" ext="pom"/>
     <artifact name="ant-javamail" type="pom.asc" ext="pom.asc"/>
     <artifact name="ant-javamail" type="jar" ext="jar"/>
     <artifact name="ant-javamail" type="jar.asc" ext="jar.asc"/>
-    <artifact name="ant-javamail" type="source" ext="jar" e:classifier="sources" />
-    <artifact name="ant-javamail" type="source.asc" ext="jar.asc" e:classifier="sources" />
+    <artifact name="ant-javamail" type="source" ext="jar" e:classifier="sources"/>
+    <artifact name="ant-javamail" type="source.asc" ext="jar.asc" e:classifier="sources"/>
     <artifact name="ant-jdepend" type="pom" ext="pom"/>
     <artifact name="ant-jdepend" type="pom.asc" ext="pom.asc"/>
     <artifact name="ant-jdepend" type="jar" ext="jar"/>
     <artifact name="ant-jdepend" type="jar.asc" ext="jar.asc"/>
-    <artifact name="ant-jdepend" type="source" ext="jar" e:classifier="sources" />
-    <artifact name="ant-jdepend" type="source.asc" ext="jar.asc" e:classifier="sources" />
+    <artifact name="ant-jdepend" type="source" ext="jar" e:classifier="sources"/>
+    <artifact name="ant-jdepend" type="source.asc" ext="jar.asc" e:classifier="sources"/>
     <artifact name="ant-jmf" type="pom" ext="pom"/>
     <artifact name="ant-jmf" type="pom.asc" ext="pom.asc"/>
     <artifact name="ant-jmf" type="jar" ext="jar"/>
     <artifact name="ant-jmf" type="jar.asc" ext="jar.asc"/>
-    <artifact name="ant-jmf" type="source" ext="jar" e:classifier="sources" />
-    <artifact name="ant-jmf" type="source.asc" ext="jar.asc" e:classifier="sources" />
+    <artifact name="ant-jmf" type="source" ext="jar" e:classifier="sources"/>
+    <artifact name="ant-jmf" type="source.asc" ext="jar.asc" e:classifier="sources"/>
     <artifact name="ant-jsch" type="pom" ext="pom"/>
     <artifact name="ant-jsch" type="pom.asc" ext="pom.asc"/>
     <artifact name="ant-jsch" type="jar" ext="jar"/>
     <artifact name="ant-jsch" type="jar.asc" ext="jar.asc"/>
-    <artifact name="ant-jsch" type="source" ext="jar" e:classifier="sources" />
-    <artifact name="ant-jsch" type="source.asc" ext="jar.asc" e:classifier="sources" />
+    <artifact name="ant-jsch" type="source" ext="jar" e:classifier="sources"/>
+    <artifact name="ant-jsch" type="source.asc" ext="jar.asc" e:classifier="sources"/>
     <artifact name="ant-junit" type="pom" ext="pom"/>
     <artifact name="ant-junit" type="pom.asc" ext="pom.asc"/>
     <artifact name="ant-junit" type="jar" ext="jar"/>
     <artifact name="ant-junit" type="jar.asc" ext="jar.asc"/>
-    <artifact name="ant-junit" type="source" ext="jar" e:classifier="sources" />
-    <artifact name="ant-junit" type="source.asc" ext="jar.asc" e:classifier="sources" />
+    <artifact name="ant-junit" type="source" ext="jar" e:classifier="sources"/>
+    <artifact name="ant-junit" type="source.asc" ext="jar.asc" e:classifier="sources"/>
     <artifact name="ant-junit4" type="pom" ext="pom"/>
     <artifact name="ant-junit4" type="pom.asc" ext="pom.asc"/>
     <artifact name="ant-junit4" type="jar" ext="jar"/>
     <artifact name="ant-junit4" type="jar.asc" ext="jar.asc"/>
-    <artifact name="ant-junit4" type="source" ext="jar" e:classifier="sources" />
-    <artifact name="ant-junit4" type="source.asc" ext="jar.asc" e:classifier="sources" />
+    <artifact name="ant-junit4" type="source" ext="jar" e:classifier="sources"/>
+    <artifact name="ant-junit4" type="source.asc" ext="jar.asc" e:classifier="sources"/>
     <artifact name="ant-launcher" type="pom" ext="pom"/>
     <artifact name="ant-launcher" type="pom.asc" ext="pom.asc"/>
     <artifact name="ant-launcher" type="jar" ext="jar"/>
     <artifact name="ant-launcher" type="jar.asc" ext="jar.asc"/>
-    <artifact name="ant-launcher" type="source" ext="jar" e:classifier="sources" />
-    <artifact name="ant-launcher" type="source.asc" ext="jar.asc" e:classifier="sources" />
+    <artifact name="ant-launcher" type="source" ext="jar" e:classifier="sources"/>
+    <artifact name="ant-launcher" type="source.asc" ext="jar.asc" e:classifier="sources"/>
     <artifact name="ant-netrexx" type="pom" ext="pom"/>
     <artifact name="ant-netrexx" type="pom.asc" ext="pom.asc"/>
     <artifact name="ant-netrexx" type="jar" ext="jar"/>
     <artifact name="ant-netrexx" type="jar.asc" ext="jar.asc"/>
-    <artifact name="ant-netrexx" type="source" ext="jar" e:classifier="sources" />
-    <artifact name="ant-netrexx" type="source.asc" ext="jar.asc" e:classifier="sources" />
+    <artifact name="ant-netrexx" type="source" ext="jar" e:classifier="sources"/>
+    <artifact name="ant-netrexx" type="source.asc" ext="jar.asc" e:classifier="sources"/>
     <artifact name="ant-swing" type="pom" ext="pom"/>
     <artifact name="ant-swing" type="pom.asc" ext="pom.asc"/>
     <artifact name="ant-swing" type="jar" ext="jar"/>
     <artifact name="ant-swing" type="jar.asc" ext="jar.asc"/>
-    <artifact name="ant-swing" type="source" ext="jar" e:classifier="sources" />
-    <artifact name="ant-swing" type="source.asc" ext="jar.asc" e:classifier="sources" />
+    <artifact name="ant-swing" type="source" ext="jar" e:classifier="sources"/>
+    <artifact name="ant-swing" type="source.asc" ext="jar.asc" e:classifier="sources"/>
     <artifact name="ant-testutil" type="pom" ext="pom"/>
     <artifact name="ant-testutil" type="pom.asc" ext="pom.asc"/>
     <artifact name="ant-testutil" type="jar" ext="jar"/>
     <artifact name="ant-testutil" type="jar.asc" ext="jar.asc"/>
-    <artifact name="ant-testutil" type="source" ext="jar" e:classifier="sources" />
-    <artifact name="ant-testutil" type="source.asc" ext="jar.asc" e:classifier="sources" />
+    <artifact name="ant-testutil" type="source" ext="jar" e:classifier="sources"/>
+    <artifact name="ant-testutil" type="source.asc" ext="jar.asc" e:classifier="sources"/>
     <artifact name="ant-xz" type="pom" ext="pom"/>
     <artifact name="ant-xz" type="pom.asc" ext="pom.asc"/>
     <artifact name="ant-xz" type="jar" ext="jar"/>
     <artifact name="ant-xz" type="jar.asc" ext="jar.asc"/>
-    <artifact name="ant-xz" type="source" ext="jar" e:classifier="sources" />
-    <artifact name="ant-xz" type="source.asc" ext="jar.asc" e:classifier="sources" />
+    <artifact name="ant-xz" type="source" ext="jar" e:classifier="sources"/>
+    <artifact name="ant-xz" type="source.asc" ext="jar.asc" e:classifier="sources"/>
   </publications>
-  <dependencies/> 
+  <dependencies/>
 </ivy-module>
diff --git a/src/etc/poms/ant-apache-log4j/pom.xml b/src/etc/poms/ant-apache-log4j/pom.xml
index c689dd002..71400be5a 100644
--- a/src/etc/poms/ant-apache-log4j/pom.xml
+++ b/src/etc/poms/ant-apache-log4j/pom.xml
@@ -44,7 +44,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
-      <version>1.2.13</version>
+      <version>1.2.14</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff --git a/src/etc/poms/ant-apache-oro/pom.xml b/src/etc/poms/ant-apache-oro/pom.xml
index 677060457..86ef6eb2f 100644
--- a/src/etc/poms/ant-apache-oro/pom.xml
+++ b/src/etc/poms/ant-apache-oro/pom.xml
@@ -51,7 +51,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.11</version>
+      <version>4.12</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/src/etc/poms/ant-apache-regexp/pom.xml b/src/etc/poms/ant-apache-regexp/pom.xml
index 6ae1064df..e52187815 100644
--- a/src/etc/poms/ant-apache-regexp/pom.xml
+++ b/src/etc/poms/ant-apache-regexp/pom.xml
@@ -42,9 +42,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>regexp</groupId>
-      <artifactId>regexp</artifactId>
-      <version>1.3</version>
+      <groupId>jakarta-regexp</groupId>
+      <artifactId>jakarta-regexp</artifactId>
+      <version>1.4</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff --git a/src/etc/poms/ant-apache-resolver/pom.xml b/src/etc/poms/ant-apache-resolver/pom.xml
index 013f0989c..43990fdf7 100644
--- a/src/etc/poms/ant-apache-resolver/pom.xml
+++ b/src/etc/poms/ant-apache-resolver/pom.xml
@@ -44,7 +44,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
     <dependency>
       <groupId>xml-resolver</groupId>
       <artifactId>xml-resolver</artifactId>
-      <version>1.1</version>
+      <version>1.2</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff --git a/src/etc/poms/ant-apache-xalan2/pom.xml b/src/etc/poms/ant-apache-xalan2/pom.xml
index 81fb68118..f02b876c8 100644
--- a/src/etc/poms/ant-apache-xalan2/pom.xml
+++ b/src/etc/poms/ant-apache-xalan2/pom.xml
@@ -45,7 +45,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
     <dependency>
       <groupId>xalan</groupId>
       <artifactId>xalan</artifactId>
-      <version>2.7.1</version>
+      <version>2.7.2</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff --git a/src/etc/poms/ant-commons-logging/pom.xml b/src/etc/poms/ant-commons-logging/pom.xml
index 0274c035f..5dfbb80fb 100644
--- a/src/etc/poms/ant-commons-logging/pom.xml
+++ b/src/etc/poms/ant-commons-logging/pom.xml
@@ -45,7 +45,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging-api</artifactId>
-      <version>1.0.4</version>
+      <version>1.1</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff --git a/src/etc/poms/ant-commons-net/pom.xml b/src/etc/poms/ant-commons-net/pom.xml
index b2534ccb4..7e0100585 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.0</version>
+      <version>1.4.1</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 21a0304ab..0164fbadd 100644
--- a/src/etc/poms/ant-javamail/pom.xml
+++ b/src/etc/poms/ant-javamail/pom.xml
@@ -46,8 +46,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
     </dependency>
     <dependency>
       <groupId>javax.mail</groupId>
-      <artifactId>mail</artifactId>
-      <version>1.4</version>
+      <artifactId>javax.mail-api</artifactId>
+      <version>1.5.6</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
diff --git a/src/etc/poms/ant-junit/pom.xml b/src/etc/poms/ant-junit/pom.xml
index 4e0f9f809..b424a4822 100644
--- a/src/etc/poms/ant-junit/pom.xml
+++ b/src/etc/poms/ant-junit/pom.xml
@@ -45,7 +45,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.11</version>
+      <version>4.12</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff --git a/src/etc/poms/ant-junit4/pom.xml b/src/etc/poms/ant-junit4/pom.xml
index ad554096b..a1105c203 100644
--- a/src/etc/poms/ant-junit4/pom.xml
+++ b/src/etc/poms/ant-junit4/pom.xml
@@ -45,7 +45,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.11</version>
+            <version>4.12</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
diff --git a/src/etc/poms/ant-testutil/pom.xml b/src/etc/poms/ant-testutil/pom.xml
index 59c73b6b1..43577a807 100644
--- a/src/etc/poms/ant-testutil/pom.xml
+++ b/src/etc/poms/ant-testutil/pom.xml
@@ -46,7 +46,7 @@
      <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.11</version>
+      <version>4.12</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff --git a/src/etc/poms/ant/pom.xml b/src/etc/poms/ant/pom.xml
index 755d0c876..c06b56879 100644
--- a/src/etc/poms/ant/pom.xml
+++ b/src/etc/poms/ant/pom.xml
@@ -45,10 +45,16 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.11</version>
+      <version>4.12</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
+    <dependency>
+      <groupId>org.apache.ant</groupId>
+      <artifactId>ant-antunit</artifactId>
+      <version>1.3</version>
+      <scope>test</scope>
+    </dependency>
   <build>
     <filters>
       <filter>../../../../target/ant/.build.timestamp.properties</filter>